diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-04-07 15:43:28 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-04-07 15:43:28 +0000 |
| commit | 46aadc5c16150446840a26ea7199380830369326 (patch) | |
| tree | fd41b11d20b3c6589b01d4500ad234d3582b5379 /app/views/projects/branches/_branch.html.haml | |
| parent | 2d246df57dd8e7da8c2743fba38d31992bc7a3fc (diff) | |
| parent | 6f15e89a6b83dcfef897dda414325b85090e2c40 (diff) | |
| download | gitlab-ce-46aadc5c16150446840a26ea7199380830369326.tar.gz | |
Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master'
Protected Tags
Closes #18471
See merge request !10356
Diffstat (limited to 'app/views/projects/branches/_branch.html.haml')
| -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 724675e659c..0f9ef3eded3 100644 --- a/app/views/projects/branches/_branch.html.haml +++ b/app/views/projects/branches/_branch.html.haml @@ -15,7 +15,7 @@ %span.label.label-info.has-tooltip{ title: "Merged into #{@repository.root_ref}" } merged - - if @project.protected_branch? branch.name + - if protected_branch?(@project, branch) %span.label.label-success protected .controls.hidden-xs< |