diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-06 12:52:26 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-06 12:52:26 +0200 |
| commit | 8b6ae0104df7e053ff3ad06e089c96273854c4e3 (patch) | |
| tree | 02082a5c3d07d010ab149668f12e6753bef0c6a9 /lib/api/merge_requests.rb | |
| parent | 04f2da3c37dfe0218033a2703afe35a0dc8d2686 (diff) | |
| parent | fff36a8b8965e4bddd8020caf5072e79bf131a74 (diff) | |
| download | gitlab-ce-8b6ae0104df7e053ff3ad06e089c96273854c4e3.tar.gz | |
Merge branch 'master' into comment-updated-by
Diffstat (limited to 'lib/api/merge_requests.rb')
| -rw-r--r-- | lib/api/merge_requests.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index ce21c699e8f..7412274b045 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) |