diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-07-20 08:07:21 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-07-20 08:07:21 +0000 |
| commit | ad56ae0d17780483b3c71625d24074a90b77f354 (patch) | |
| tree | 97739ae84a9fc43bebc5b7397eada1002df66572 /app/views | |
| parent | 1540cc434b66e32f723fff5de3fbc2f7e9480e0b (diff) | |
| parent | 1ec5136128364f36f88713f7678188b5d478e6c9 (diff) | |
| download | gitlab-ce-ad56ae0d17780483b3c71625d24074a90b77f354.tar.gz | |
Merge branch '35253-desc-protected-branches-for-non-member' into 'master'
Hide description about protected branches to non-member
Closes #35253
See merge request !12945
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/branches/index.html.haml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/projects/branches/index.html.haml b/app/views/projects/branches/index.html.haml index f18a37ba499..945a5c11d6d 100644 --- a/app/views/projects/branches/index.html.haml +++ b/app/views/projects/branches/index.html.haml @@ -7,9 +7,10 @@ %div{ class: container_class } .top-area.adjust - .nav-text - Protected branches can be managed in - = link_to 'project settings', project_protected_branches_path(@project) + - if can?(current_user, :admin_project, @project) + .nav-text + Protected branches can be managed in + = link_to 'project settings', project_protected_branches_path(@project) .nav-controls = form_tag(filter_branches_path, method: :get) do |