Fix bad conflict resolution

38796f56 · Lin Jen-Shin · f8fe64a6 · 38796f56
Commit 38796f56 authored Apr 07, 2017 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

app/models/ci/pipeline.rb app/models/ci/pipeline.rb +5 -6

No files found.
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -228,13 +228,12 @@ module Ci
    end
    def cancel_running
-      Gitlab::OptimisticLocking.retry_lock(
+      Gitlab::OptimisticLocking.retry_lock(cancelable_statuses) do |cancelable|
-        statuses.cancelable) do |cancelable|
+        cancelable.find_each do |job|
-          cancelable.find_each do |job|
+          yield(job) if block_given?
-            yield(job) if block_given?
+          job.cancel
-            job.cancel
-          end
        end
+      end
    end
    def auto_cancel_running(pipeline)