summaryrefslogtreecommitdiff
path: root/app/models/ci/pipeline.rb
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-10-17 15:45:39 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-10-17 15:52:10 +0800
commit0ea7f32afe9ff806f912a25efb4e967ee5da1e10 (patch)
treef3b1e0760042e1cc7f49ad50fd6016ebe8f9da86 /app/models/ci/pipeline.rb
parentcb8654e85650ba6107031cc978d882f4b2f272cf (diff)
downloadgitlab-ce-0ea7f32afe9ff806f912a25efb4e967ee5da1e10.tar.gz
Make cancelled pipelines being able to retry
Closes #23326
Diffstat (limited to 'app/models/ci/pipeline.rb')
-rw-r--r--app/models/ci/pipeline.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 4fdb5fef4fb..a78b33988be 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -152,7 +152,7 @@ module Ci
def retryable?
builds.latest.any? do |build|
- build.failed? && build.retryable?
+ (build.failed? || build.canceled?) && build.retryable?
end
end