From a7fded9b9529cfc08463afd4f6cf12478262e951 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 16 Jul 2015 16:03:07 +0200 Subject: Huge refactoring for accepting merge requests Signed-off-by: Dmitriy Zaporozhets --- lib/api/merge_requests.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/api/merge_requests.rb') 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) -- cgit v1.2.1 From c17f5d06aa4a55a8446928ea6b690ae8e09ce237 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 4 Aug 2015 16:33:53 +0200 Subject: Fix merge api and spec Signed-off-by: Dmitriy Zaporozhets --- lib/api/merge_requests.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/api/merge_requests.rb') diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index a956c960a2e..e8b49fb7cba 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -200,7 +200,7 @@ module API if merge_request.can_be_merged? commit_message = params[:merge_commit_message] || merge_request.merge_commit_message - MergeRequests::MergeService.new(merge_request.target_project, current_user). + ::MergeRequests::MergeService.new(merge_request.target_project, current_user). execute(merge_request, commit_message) present merge_request, with: Entities::MergeRequest -- cgit v1.2.1