diff options
| author | Jeroen Nijhof <jeroen@jeroennijhof.nl> | 2016-01-07 13:58:19 +0100 |
|---|---|---|
| committer | Jeroen Nijhof <jeroen@jeroennijhof.nl> | 2016-01-07 13:58:19 +0100 |
| commit | 1695063d15498ce41d3e3f62b7ec88effb9e1eca (patch) | |
| tree | 5e3fd6d580c58d942f844273daae934d5f54001f /lib/api/merge_requests.rb | |
| parent | bde76f62fc2bd259dcc37ca649a01a84035ddcd9 (diff) | |
| parent | 3b04268f6825776e12d3a7766eeb059f892765f3 (diff) | |
| download | gitlab-ce-1695063d15498ce41d3e3f62b7ec88effb9e1eca.tar.gz | |
Merge gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'lib/api/merge_requests.rb')
| -rw-r--r-- | lib/api/merge_requests.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb index 3c1c6bda260..5c97fe1c88c 100644 --- a/lib/api/merge_requests.rb +++ b/lib/api/merge_requests.rb @@ -211,7 +211,7 @@ module API unauthorized! unless merge_request.can_be_merged_by?(current_user) not_allowed! if !merge_request.open? || merge_request.work_in_progress? - merge_request.check_if_can_be_merged if merge_request.unchecked? + merge_request.check_if_can_be_merged render_api_error!('Branch cannot be merged', 406) unless merge_request.can_be_merged? |