diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-01-05 16:24:42 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-01-05 16:30:03 +0100 |
| commit | 097faeb481db2a4956b41049c041d55f5da4e2c1 (patch) | |
| tree | 8e08e2bc30a8e7df5783559388a0864b5ff4864c /lib/api/merge_requests.rb | |
| parent | 7c3c901ada6fc4a6d2d3ce7a2cf8188cf6615008 (diff) | |
| download | gitlab-ce-097faeb481db2a4956b41049c041d55f5da4e2c1.tar.gz | |
Get "Merge when build succeeds" to work when commits were pushed to MR target branch while builds were running
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? |