diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-10-12 11:03:55 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-10-12 11:03:55 +0000 |
| commit | c004bb3e74b6a60a4b6ede93d0ea8a898e56c41b (patch) | |
| tree | 428673d34c8c0e1993254167a3cd32f4b15cfc64 | |
| parent | c0c45c72a8aa0d6c04b140508f928776b0a690ae (diff) | |
| parent | f0150ef4d9ac869be21079d21c856a1ede72a3bf (diff) | |
| download | gitlab-ce-c004bb3e74b6a60a4b6ede93d0ea8a898e56c41b.tar.gz | |
Merge branch 'add-disabled-delete-button' into 'master'
Add disabled delete button to protected branches
## What does this MR do?
Add's a disabled CSS style for the delete button on protected branches instead of hiding the button
## What are the relevant issue numbers?
Closes #22358
See merge request !6439
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/projects/branches/_branch.html.haml | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index fc362ac3669..2d16f7fd3ab 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -70,6 +70,7 @@ v 8.13.0 (unreleased) - Fix Long commit messages overflow viewport in file tree - Revert avoid touching file system on Build#artifacts? - Stop using a Redis lease when updating the project activity timestamp whenever a new event is created + - Add disabled delete button to protected branches (ClemMakesApps) - Add broadcast messages and alerts below sub-nav - Better empty state for Groups view - Update ruby-prof to 0.16.2. !6026 (Elan Ruusamäe) diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml index 5217b8bf028..4480b2f22c3 100644 --- a/app/views/projects/branches/_branch.html.haml +++ b/app/views/projects/branches/_branch.html.haml @@ -30,8 +30,8 @@ = render 'projects/buttons/download', project: @project, ref: branch.name - - if can_remove_branch?(@project, branch.name) - = link_to namespace_project_branch_path(@project.namespace, @project, branch.name), class: 'btn btn-remove remove-row has-tooltip', title: "Delete branch", method: :delete, data: { confirm: "Deleting the '#{branch.name}' branch cannot be undone. Are you sure?", container: 'body' }, remote: true do + - if can?(current_user, :push_code, @project) + = link_to namespace_project_branch_path(@project.namespace, @project, branch.name), class: "btn btn-remove remove-row has-tooltip #{can_remove_branch?(@project, branch.name) ? '' : 'disabled'}", title: "Delete branch", method: :delete, data: { confirm: "Deleting the '#{branch.name}' branch cannot be undone. Are you sure?", container: 'body' }, remote: true do = icon("trash-o") - if branch.name != @repository.root_ref |