diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-12 18:01:22 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-12 18:01:22 +0300 |
| commit | 5880d7df6253fc97024005e7c32dbc41def99aaf (patch) | |
| tree | 369f8ae1231f3646bd2358a73f3737e0d06a6c32 /lib | |
| parent | 0c73e6664389ef5af352560c2fced1fbfc650a27 (diff) | |
| download | gitlab-ce-5880d7df6253fc97024005e7c32dbc41def99aaf.tar.gz | |
Docs for merge api
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/merge_requests.rb | 1 |
1 files changed, 1 insertions, 0 deletions
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 |