diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-11-21 13:30:24 +0100 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-11-21 13:30:24 +0100 |
commit | f0d5ef963fb591beaec768262476677c8c48c734 (patch) | |
tree | d8633c1af85844f98cc2fd9350b2446f3c7e34d5 /app | |
parent | 900999f8180e49aa1677286e3e0cfa08d47829a7 (diff) | |
download | gitlab-ce-f0d5ef963fb591beaec768262476677c8c48c734.tar.gz |
Do not create TODO when build is allowed to fail
Diffstat (limited to 'app')
-rw-r--r-- | app/models/ci/build.rb | 6 | ||||
-rw-r--r-- | app/services/merge_requests/add_todo_when_build_fails_service.rb | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 5d2e7d94190..83c0c64e5fb 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -70,7 +70,11 @@ module Ci environment: build.environment, status_event: 'enqueue' ) - MergeRequests::AddTodoWhenBuildFailsService.new(build.project, nil).close(new_build) + + MergeRequests::AddTodoWhenBuildFailsService + .new(build.project, nil) + .close(new_build) + build.pipeline.mark_as_processable_after_stage(build.stage_idx) new_build end 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 d572a928a42..12a8415d9a5 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 @@ -1,13 +1,18 @@ module MergeRequests class AddTodoWhenBuildFailsService < MergeRequests::BaseService # Adds a todo to the parent merge_request when a CI build fails + # def execute(commit_status) + return if commit_status.allow_failure? + commit_status_merge_requests(commit_status) do |merge_request| todo_service.merge_request_build_failed(merge_request) end end - # Closes any pending build failed todos for the parent MRs when a build is retried + # Closes any pending build failed todos for the parent MRs when a + # build is retried + # def close(commit_status) commit_status_merge_requests(commit_status) do |merge_request| todo_service.merge_request_build_retried(merge_request) |