diff options
| author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-04-03 18:59:58 +0100 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-04-03 19:19:54 +0100 |
| commit | bf3cc824e4ce6cf49a82210eaaf1cca06f7fd281 (patch) | |
| tree | 04d422fe8b68079ef604348ffe96b1f2b72285ff /app/views/projects/branches | |
| parent | b8c7bef5c092152ea85d1840e587cfc04293e1d7 (diff) | |
| download | gitlab-ce-bf3cc824e4ce6cf49a82210eaaf1cca06f7fd281.tar.gz | |
Moved Project#protected_branch? to ProtectedBranch, similar for tags
Diffstat (limited to 'app/views/projects/branches')
| -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 9eb610ba9c0..d84fa9e55c0 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 ProtectedBranch.protected?(@project, branch.name) %span.label.label-success protected .controls.hidden-xs< |