diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-14 11:00:44 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-14 11:00:44 +0000 |
| commit | 45593d574ce0d851711ea776c9f9fd673eec689c (patch) | |
| tree | af281e07469689fcd0e31678451a9f99e46a6434 | |
| parent | c81023435795766411c5954a4676ebb215af40a6 (diff) | |
| parent | 5983e9bdf2aebb455aa7395541bb9d93d6d4de38 (diff) | |
| download | gitlab-ce-45593d574ce0d851711ea776c9f9fd673eec689c.tar.gz | |
Merge branch 'tweak-flow-merge-when-build-succeeds' into 'master'
Minor fix in flow 'Merge when build succeeds'
When a user, which is not the merge user, want to removes the source branch
after the automatic merge this might fail because of checks in the
DeleteBranchService
/cc @DouweM
See merge request !2070
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml b/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml index 08af124274b..2168294c683 100644 --- a/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml +++ b/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml @@ -12,7 +12,7 @@ - else The source branch will not be removed. - - remove_source_branch_button = @merge_request.can_remove_source_branch?(current_user) && !should_remove_source_branch + - remove_source_branch_button = @merge_request.can_remove_source_branch?(current_user) && !should_remove_source_branch && @merge_request.merge_user == current_user - user_can_cancel_automatic_merge = @merge_request.can_cancel_merge_when_build_succeeds?(current_user) - if remove_source_branch_button || user_can_cancel_automatic_merge .clearfix.prepend-top-10 |