Huge refactoring for accepting merge requests

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index aa43e1dffd9..a956c960a2e 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -198,7 +198,11 @@ module API
 
           if merge_request.open? && !merge_request.work_in_progress?
             if merge_request.can_be_merged?
-              merge_request.automerge!(current_user, params[:merge_commit_message] || merge_request.merge_commit_message)
+              commit_message = params[:merge_commit_message] || merge_request.merge_commit_message
+
+              MergeRequests::MergeService.new(merge_request.target_project, current_user).
+                execute(merge_request, commit_message)
+
               present merge_request, with: Entities::MergeRequest
             else
               render_api_error!('Branch cannot be merged', 405)