Commit a89d93ec authored by Jason Goodman's avatar Jason Goodman Committed by Kamil Trzciński

Refactor merge requests create pipeline service

Extract pipeline_ref function
parent 6f4bb03a
...@@ -9,15 +9,10 @@ module MergeRequests ...@@ -9,15 +9,10 @@ module MergeRequests
end end
def create_detached_merge_request_pipeline(merge_request) def create_detached_merge_request_pipeline(merge_request)
if can_use_merge_request_ref?(merge_request) Ci::CreatePipelineService.new(merge_request.source_project,
Ci::CreatePipelineService.new(merge_request.source_project, current_user, current_user,
ref: merge_request.ref_path) ref: pipeline_ref_for_detached_merge_request_pipeline(merge_request))
.execute(:merge_request_event, merge_request: merge_request) .execute(:merge_request_event, merge_request: merge_request)
else
Ci::CreatePipelineService.new(merge_request.source_project, current_user,
ref: merge_request.source_branch)
.execute(:merge_request_event, merge_request: merge_request)
end
end end
def can_create_pipeline_for?(merge_request) def can_create_pipeline_for?(merge_request)
...@@ -33,6 +28,16 @@ module MergeRequests ...@@ -33,6 +28,16 @@ module MergeRequests
def allow_duplicate def allow_duplicate
params[:allow_duplicate] params[:allow_duplicate]
end end
private
def pipeline_ref_for_detached_merge_request_pipeline(merge_request)
if can_use_merge_request_ref?(merge_request)
merge_request.ref_path
else
merge_request.source_branch
end
end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment