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 /app/views | |
| 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 'app/views')
| -rw-r--r-- | app/views/projects/merge_requests/_show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_show.html.haml b/app/views/projects/merge_requests/_show.html.haml index ba7c2c01e93..095876450a0 100644 --- a/app/views/projects/merge_requests/_show.html.haml +++ b/app/views/projects/merge_requests/_show.html.haml @@ -38,7 +38,7 @@ = render "projects/merge_requests/show/how_to_merge" = render "projects/merge_requests/widget/show.html.haml" - - if @merge_request.open? && @merge_request.source_branch_exists? && @merge_request.can_be_merged? && @merge_request.can_be_merged_by?(current_user) + - if @merge_request.source_branch_exists? && @merge_request.mergeable? && @merge_request.can_be_merged_by?(current_user) .light.prepend-top-default You can also accept this merge request manually using the = succeed '.' do |