summaryrefslogtreecommitdiff
path: root/app/workers/merge_requests/create_pipeline_worker.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-06-20 11:10:13 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-06-20 11:10:13 +0000
commit0ea3fcec397b69815975647f5e2aa5fe944a8486 (patch)
tree7979381b89d26011bcf9bdc989a40fcc2f1ed4ff /app/workers/merge_requests/create_pipeline_worker.rb
parent72123183a20411a36d607d70b12d57c484394c8e (diff)
downloadgitlab-ce-0ea3fcec397b69815975647f5e2aa5fe944a8486.tar.gz
Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42
Diffstat (limited to 'app/workers/merge_requests/create_pipeline_worker.rb')
-rw-r--r--app/workers/merge_requests/create_pipeline_worker.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/app/workers/merge_requests/create_pipeline_worker.rb b/app/workers/merge_requests/create_pipeline_worker.rb
index ee42a3dee08..b40408cf647 100644
--- a/app/workers/merge_requests/create_pipeline_worker.rb
+++ b/app/workers/merge_requests/create_pipeline_worker.rb
@@ -15,7 +15,7 @@ module MergeRequests
worker_resource_boundary :cpu
idempotent!
- def perform(project_id, user_id, merge_request_id)
+ def perform(project_id, user_id, merge_request_id, params = {})
project = Project.find_by_id(project_id)
return unless project
@@ -25,7 +25,12 @@ module MergeRequests
merge_request = MergeRequest.find_by_id(merge_request_id)
return unless merge_request
- MergeRequests::CreatePipelineService.new(project: project, current_user: user).execute(merge_request)
+ push_options = params.with_indifferent_access[:push_options]
+
+ MergeRequests::CreatePipelineService
+ .new(project: project, current_user: user, params: { push_options: push_options })
+ .execute(merge_request)
+
merge_request.update_head_pipeline
end
end