summaryrefslogtreecommitdiff
path: root/app/models/ci/build.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2019-05-08 22:52:23 +0000
committerRobert Speicher <rspeicher@gmail.com>2019-05-08 22:52:23 +0000
commitfa6e00d05dedfac9ec28bf1a4735bffc38a5b4d0 (patch)
tree07c2087939b6c6dce33620c57a6989d76547e681 /app/models/ci/build.rb
parent204dca4436f5b2c82611a873d05186ec4ff4c17c (diff)
parent2f003b58645b3cbc987c240f844b1ff6eb0c026a (diff)
downloadgitlab-ce-fa6e00d05dedfac9ec28bf1a4735bffc38a5b4d0.tar.gz
Merge branch '11-11-stable-prepare-rc2' into '11-11-stable'
Prepare 11.11.0-rc2 release See merge request gitlab-org/gitlab-ce!28215
Diffstat (limited to 'app/models/ci/build.rb')
-rw-r--r--app/models/ci/build.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 5a2ead41578..d2f5ff13408 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -352,7 +352,7 @@ module Ci
end
def retryable?
- !archived? && (success? || failed? || canceled?)
+ !archived? && (success? || failed?)
end
def retries_count