diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-01-14 17:28:44 -0500 |
|---|---|---|
| committer | Rubén Dávila <rdavila84@gmail.com> | 2016-01-14 17:28:44 -0500 |
| commit | c8db25c37c0d78457d06117497ccde7ad80e2321 (patch) | |
| tree | dc2db4637c33c53b032a22f8e78975838396ed13 /lib/api/merge_requests.rb | |
| parent | 6b9c730e91962a6d6343bcb7fc4dc75c99b41bde (diff) | |
| parent | 948bb655f3cba9909b7396c3062da7b22f4409b3 (diff) | |
| download | gitlab-ce-c8db25c37c0d78457d06117497ccde7ad80e2321.tar.gz | |
Merge branch 'master' into issue_3945
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? |