Merge branch '35253-desc-protected-branches-for-non-member' into 'master'

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

changelogs/unreleased/35253-desc-protected-branches-for-non-member.yml

+---
+title: Hide description about protected branches to non-member
+merge_request: 12945
+author: Takuya Noguchi

spec/features/projects/branches_spec.rb

@@ -24,7 +24,6 @@ describe 'Branches', feature: true do
         repository.branches_sorted_by(:name).first(20).each do |branch|
           expect(page).to have_content("#{branch.name}")
         end
-        expect(page).to have_content("Protected branches can be managed in project settings")
       end
 
       it 'sorts the branches by name' do
@@ -130,6 +129,14 @@ describe 'Branches', feature: true do
       project.team << [user, :master]
     end
 
+    describe 'Initial branches page' do
+      it 'shows description for admin' do
+        visit project_branches_path(project)
+
+        expect(page).to have_content("Protected branches can be managed in project settings")
+      end
+    end
+
     describe 'Delete protected branch' do
       before do
         visit project_protected_branches_path(project)