diff options
-rw-r--r-- | app/models/ci/pipeline.rb | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 134ca5f60a3..1f47756269e 100644 --- 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( - statuses.cancelable) do |cancelable| - cancelable.find_each do |job| - yield(job) if block_given? - job.cancel - end + Gitlab::OptimisticLocking.retry_lock(cancelable_statuses) do |cancelable| + cancelable.find_each do |job| + yield(job) if block_given? + job.cancel end + end end def auto_cancel_running(pipeline) |