summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-02-15 11:02:05 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2017-02-15 11:02:05 +0100
commit9c37a26cc744ff4479f2b3b62c15d8b0e62f728d (patch)
tree2fc784d7440ff8760944fb25cfa69ff5c9143847 /app
parent25b3b2e5bc52000ac05efa9e87bff7bd949d8ed9 (diff)
downloadgitlab-ce-9c37a26cc744ff4479f2b3b62c15d8b0e62f728d.tar.gz
Close all pipeline todos at once when retrying it
Diffstat (limited to 'app')
-rw-r--r--app/services/ci/retry_build_service.rb2
-rw-r--r--app/services/ci/retry_pipeline_service.rb4
2 files changed, 5 insertions, 1 deletions
diff --git a/app/services/ci/retry_build_service.rb b/app/services/ci/retry_build_service.rb
index ed4694237f6..a8464cd9922 100644
--- a/app/services/ci/retry_build_service.rb
+++ b/app/services/ci/retry_build_service.rb
@@ -7,7 +7,7 @@ module Ci
new_build.enqueue!
MergeRequests::AddTodoWhenBuildFailsService
- .new(build.project, current_user)
+ .new(project, current_user)
.close(new_build)
end
end
diff --git a/app/services/ci/retry_pipeline_service.rb b/app/services/ci/retry_pipeline_service.rb
index 8a1a9191478..808f29adea2 100644
--- a/app/services/ci/retry_pipeline_service.rb
+++ b/app/services/ci/retry_pipeline_service.rb
@@ -12,6 +12,10 @@ module Ci
.reprocess(build)
end
+ MergeRequests::AddTodoWhenBuildFailsService
+ .new(project, current_user)
+ .close_all(pipeline)
+
pipeline.process!
end