diff options
author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-06-06 08:32:04 +0000 |
---|---|---|
committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-06-06 08:32:04 +0000 |
commit | 8501edcd465923c9c6a45abe6c863fc3cd25973a (patch) | |
tree | e431db125935a9b609d0a25f707cc50e1b59e555 /app/models | |
parent | 6e5d891e508d92f3a983f2edd4f441c8b0fdad74 (diff) | |
parent | e58e24b4d4256a42c0c7e764227f3c3c53fdb1bd (diff) | |
download | gitlab-ce-8501edcd465923c9c6a45abe6c863fc3cd25973a.tar.gz |
Merge branch 'revert-86900f00' into 'master'
Revert "Disable retrying cancelled jobs"
Closes #62350
See merge request gitlab-org/gitlab-ce!29201
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/ci/build.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index aaa326afea5..89cc082d0bc 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -343,7 +343,7 @@ module Ci end def retryable? - !archived? && (success? || failed?) + !archived? && (success? || failed? || canceled?) end def retries_count |