diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 10:28:42 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 10:28:42 +0200 |
| commit | 9f10943c1a76576ac40d96189a28a4d6123a75d8 (patch) | |
| tree | 88955d92ebc98a4165d66a36cb8a2cf92709981a /lib/api | |
| parent | 84727fba96c6794874e1f94d581408b70e1842a7 (diff) | |
| download | gitlab-ce-9f10943c1a76576ac40d96189a28a4d6123a75d8.tar.gz | |
Revert "Merge branch 'drop-satellites'"
This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing
changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/merge_requests.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 7412274b045..ce21c699e8f 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -198,11 +198,7 @@ module API if merge_request.open? && !merge_request.work_in_progress? 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). - execute(merge_request, commit_message) - + merge_request.automerge!(current_user, params[:merge_commit_message] || merge_request.merge_commit_message) present merge_request, with: Entities::MergeRequest else render_api_error!('Branch cannot be merged', 405) |