diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-05 15:40:14 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-05 15:40:14 +0200 |
| commit | 957e849f41d96fa9778fcdd06792d2f0274b29ab (patch) | |
| tree | eb100ece04228262142e6ebfeb1df9b1efb824b2 /lib/api | |
| parent | 6b9dbe9f5a175a8162abf296367f561bab3eea1a (diff) | |
| parent | 1cb8588c662df41a76788759737e5b9ecb2ceba6 (diff) | |
| download | gitlab-ce-957e849f41d96fa9778fcdd06792d2f0274b29ab.tar.gz | |
Merge branch 'drop-satellites'
Diffstat (limited to 'lib/api')
| -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) |