diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-06-03 11:24:59 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-06-03 11:24:59 +0000 |
commit | a7fd826a539c39b6c3a5cf3a6ed3a49c437f865e (patch) | |
tree | 78cade8f550bdf2930527269f48e02d6766342c2 /lib | |
parent | b2d7b7adc029f07c3e84bc7f84d2cba31f6cf31a (diff) | |
parent | 84e550fad9c95dd19bb1739fc48ef6694c9f737d (diff) | |
download | gitlab-ce-a7fd826a539c39b6c3a5cf3a6ed3a49c437f865e.tar.gz |
Merge branch 'abstract-auto-merge' into 'master'
Refactor and abstract Auto Merge Processes
See merge request gitlab-org/gitlab-ce!28595
Diffstat (limited to 'lib')
-rw-r--r-- | lib/api/merge_requests.rb | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index ce85772e4ed..955624404f1 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -386,9 +386,8 @@ module API ) if merge_when_pipeline_succeeds && merge_request.head_pipeline && merge_request.head_pipeline.active? - ::MergeRequests::MergeWhenPipelineSucceedsService - .new(merge_request.target_project, current_user, merge_params) - .execute(merge_request) + AutoMergeService.new(merge_request.target_project, current_user, merge_params) + .execute(merge_request, AutoMergeService::STRATEGY_MERGE_WHEN_PIPELINE_SUCCEEDS) else ::MergeRequests::MergeService .new(merge_request.target_project, current_user, merge_params) @@ -429,11 +428,9 @@ module API post ':id/merge_requests/:merge_request_iid/cancel_merge_when_pipeline_succeeds' do merge_request = find_project_merge_request(params[:merge_request_iid]) - unauthorized! unless merge_request.can_cancel_merge_when_pipeline_succeeds?(current_user) + unauthorized! unless merge_request.can_cancel_auto_merge?(current_user) - ::MergeRequests::MergeWhenPipelineSucceedsService - .new(merge_request.target_project, current_user) - .cancel(merge_request) + AutoMergeService.new(merge_request.target_project, current_user).cancel(merge_request) end desc 'Rebase the merge request against its target branch' do |