diff options
| author | Douwe Maan <douwe@selenight.nl> | 2018-04-02 18:30:49 +0200 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-04-10 15:46:20 +0200 |
| commit | 05732d90da0c556d6857bb4c1acd46d676dd07ba (patch) | |
| tree | d26527f4ca748fc65b7e178e61cbd6631d591e51 /app/views | |
| parent | 9d220da84117220317ccff1421a394185fefe859 (diff) | |
| download | gitlab-ce-05732d90da0c556d6857bb4c1acd46d676dd07ba.tar.gz | |
Rename delete_protected_branch ability to push_to_delete_protected_branch to prevent confusion with destroy_protected_branch
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/branches/_branch.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/branches/_branch.html.haml b/app/views/projects/branches/_branch.html.haml index 883dfb3e6c8..8bc146cbaf4 100644 --- a/app/views/projects/branches/_branch.html.haml +++ b/app/views/projects/branches/_branch.html.haml @@ -61,7 +61,7 @@ title: s_('Branches|The default branch cannot be deleted') } = icon("trash-o") - elsif protected_branch?(@project, branch) - - if can?(current_user, :delete_protected_branch, @project) + - if can?(current_user, :push_to_delete_protected_branch, @project) %button{ class: "btn btn-remove remove-row js-ajax-loading-spinner has-tooltip", title: s_('Branches|Delete protected branch'), data: { toggle: "modal", |