Fix pipeline related failing specs

45f11780 · Felipe Artur · d614a9c3 · 45f11780
Commit 45f11780 authored Apr 11, 2017 by Felipe Artur
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

app/models/ci/pipeline.rb app/models/ci/pipeline.rb +3 -2

No files found.
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -231,12 +231,13 @@ module Ci
    end

    def cancel_running
-      Gitlab::OptimisticLocking.retry_lock(
-        statuses.cancelable) do |job|
+      Gitlab::OptimisticLocking.retry_lock(statuses.cancelable) do |cancelable|
+        cancelable.find_each do |job|
          yield(job) if block_given?
          job.cancel
        end
      end
+    end

    def auto_cancel_running(pipeline)
      update(auto_canceled_by: pipeline)