diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-10-16 12:14:42 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-10-16 12:14:42 +0000 |
| commit | 915120a60f7f7d5952fc2fe135a73071c94c3b00 (patch) | |
| tree | 7db2159ec05be5285482b0a667b1aeadeb3fcb31 /app/services | |
| parent | 22ef1c1a4b7927b664c5b589d222970af08fd814 (diff) | |
| parent | 6247886405b5f15e05750049254f2d341b9de72d (diff) | |
| download | gitlab-ce-915120a60f7f7d5952fc2fe135a73071c94c3b00.tar.gz | |
Merge branch '38236-remove-build-failed-todo-if-it-has-been-auto-retried' into 'master'
Resolve "Remove "Build failed" TODO if it has been auto-retried"
Closes #38236
See merge request gitlab-org/gitlab-ce!14869
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/ci/retry_build_service.rb | 2 | ||||
| -rw-r--r-- | app/services/merge_requests/add_todo_when_build_fails_service.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/services/ci/retry_build_service.rb b/app/services/ci/retry_build_service.rb index d67b9f5cc56..c552193e66b 100644 --- a/app/services/ci/retry_build_service.rb +++ b/app/services/ci/retry_build_service.rb @@ -28,6 +28,8 @@ module Ci attributes.push([:user, current_user]) + build.retried = true + Ci::Build.transaction do # mark all other builds of that name as retried build.pipeline.builds.latest diff --git a/app/services/merge_requests/add_todo_when_build_fails_service.rb b/app/services/merge_requests/add_todo_when_build_fails_service.rb index 727768b1a39..6805b2f7d1c 100644 --- a/app/services/merge_requests/add_todo_when_build_fails_service.rb +++ b/app/services/merge_requests/add_todo_when_build_fails_service.rb @@ -3,7 +3,7 @@ module MergeRequests # Adds a todo to the parent merge_request when a CI build fails # def execute(commit_status) - return if commit_status.allow_failure? + return if commit_status.allow_failure? || commit_status.retried? commit_status_merge_requests(commit_status) do |merge_request| todo_service.merge_request_build_failed(merge_request) |