diff options
| author | Sam Rose <sam@gitlab.com> | 2017-03-14 20:51:32 -0400 |
|---|---|---|
| committer | Sam Rose <sam@gitlab.com> | 2017-03-14 20:51:32 -0400 |
| commit | b539445522a3bbf39400f45a6ecc3aefe5ff35ef (patch) | |
| tree | 78833360f9d0ae8ad70da43a933dad830bb3d79f | |
| parent | 2e0510600ff37b4bf5426a5180fb08c6e88647b8 (diff) | |
| download | gitlab-ce-28772-remove-source-branch-button-sometimes-appears-even-if-remove-branch-checkbox-is-checked.tar.gz | |
Fix display logic for Removing branch button after MR merge28772-remove-source-branch-button-sometimes-appears-even-if-remove-branch-checkbox-is-checked
| -rw-r--r-- | app/views/projects/merge_requests/widget/_merged_buttons.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/widget/_merged_buttons.haml b/app/views/projects/merge_requests/widget/_merged_buttons.haml index caf3bf54eef..a789d200374 100644 --- a/app/views/projects/merge_requests/widget/_merged_buttons.haml +++ b/app/views/projects/merge_requests/widget/_merged_buttons.haml @@ -1,4 +1,4 @@ -- can_remove_source_branch = local_assigns.fetch(:source_branch_exists, false) && @merge_request.can_remove_source_branch?(current_user) +- can_remove_source_branch = @merge_request.source_branch_exists? && @merge_request.can_remove_source_branch?(current_user) - mr_can_be_reverted = @merge_request.can_be_reverted?(current_user) - mr_can_be_cherry_picked = @merge_request.can_be_cherry_picked? |