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

Wrap against 80 chars and rename failed_or_canceled 

to better reflect the status. Feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7508#note_18858398
This commit is contained in:
Lin Jen-Shin 2016-11-23 19:43:56 +08:00
parent cc43c9acc2
commit bd3a544ab0
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/models/ci/pipeline.rb
View File

@ -169,17 +169,19 @@ module Ci
end
def cancel_running
Gitlab::OptimisticLocking.retry_lock(statuses.cancelable) do |cancelable|
cancelable.each(&:cancel)
end
Gitlab::OptimisticLocking.retry_lock(
statuses.cancelable) do |cancelable|
cancelable.each(&:cancel)
end
end
def retry_failed(user)
Gitlab::OptimisticLocking.retry_lock(builds.latest.failed_or_canceled) do |failed|
failed.select(&:retryable?).each do |build|
Ci::Build.retry(build, user)
Gitlab::OptimisticLocking.retry_lock(
builds.latest.failed_or_canceled) do |failed_or_canceled|
failed_or_canceled.select(&:retryable?).each do |build|
Ci::Build.retry(build, user)
end
end
end
end
def mark_as_processable_after_stage(stage_idx)