diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 14:29:43 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 14:29:43 +0200 |
| commit | c0bf026ed8253e9bf749546e40f968dbc20aaac1 (patch) | |
| tree | adb3d8f276395f8593fdac5a6153a2a51dced654 /lib/api/merge_requests.rb | |
| parent | 7f3228ec74725c02efb0e23ff8380eaa03739891 (diff) | |
| parent | 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa (diff) | |
| download | gitlab-ce-c0bf026ed8253e9bf749546e40f968dbc20aaac1.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'lib/api/merge_requests.rb')
| -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) |