diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-27 18:09:21 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-27 18:09:21 +0000 |
commit | e0fa0638a422c3e20d4423c9bb69d79afc9c7d3d (patch) | |
tree | 9abb3c0706576bbda895fe9539a55556930606e2 /app/services/merge_requests | |
parent | f8d15ca65390475e356b06dedc51e10ccd179f86 (diff) | |
download | gitlab-ce-e0fa0638a422c3e20d4423c9bb69d79afc9c7d3d.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/merge_requests')
-rw-r--r-- | app/services/merge_requests/create_pipeline_service.rb | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/app/services/merge_requests/create_pipeline_service.rb b/app/services/merge_requests/create_pipeline_service.rb index 8258efba6bf..f802aa44487 100644 --- a/app/services/merge_requests/create_pipeline_service.rb +++ b/app/services/merge_requests/create_pipeline_service.rb @@ -9,15 +9,10 @@ module MergeRequests end def create_detached_merge_request_pipeline(merge_request) - if can_use_merge_request_ref?(merge_request) - Ci::CreatePipelineService.new(merge_request.source_project, current_user, - ref: merge_request.ref_path) - .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 + Ci::CreatePipelineService.new(merge_request.source_project, + current_user, + ref: pipeline_ref_for_detached_merge_request_pipeline(merge_request)) + .execute(:merge_request_event, merge_request: merge_request) end def can_create_pipeline_for?(merge_request) @@ -33,6 +28,16 @@ module MergeRequests def allow_duplicate params[:allow_duplicate] 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 |