kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix bad conflict resolution

Browse source
This commit is contained in:
Lin Jen-Shin 2017-04-07 14:47:15 +08:00
parent f8fe64a630
commit 38796f5617
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/models/ci/pipeline.rb
View file

@ -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)