From 5880d7df6253fc97024005e7c32dbc41def99aaf Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 12 May 2014 18:01:22 +0300 Subject: Docs for merge api Signed-off-by: Dmitriy Zaporozhets --- lib/api/merge_requests.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index f9a4037dd26..3dffe7bd4df 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -137,6 +137,7 @@ module API if merge_request.open? if merge_request.can_be_merged? 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) end -- cgit v1.2.1