diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-05-02 10:28:39 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2019-05-02 10:28:39 +0000 |
| commit | 86900f00004ed5f862c3b72b4f643036f97a8e56 (patch) | |
| tree | bee69e311b41536d323f617984b340df28f3febc /app | |
| parent | 743508bfa5f19b201790f14648667eb38e255282 (diff) | |
| parent | d6cf6fd754842d67fe4bcc39e35a9a298ac60091 (diff) | |
| download | gitlab-ce-86900f00004ed5f862c3b72b4f643036f97a8e56.tar.gz | |
Merge branch '53064-bypassing-pipeline-jobs-by-canceling-the-pipeline-and-manually-running-later-jobs' into 'master'
Disable retrying cancelled jobs
Closes #53064
See merge request gitlab-org/gitlab-ce!27503
Diffstat (limited to 'app')
| -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 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 |