Merge branch '356703-protected-branches-setting' into 'master'

Remove setting link from branches page

See merge request gitlab-org/gitlab!85323

app/views/projects/branches/_panel.html.haml

@@ -7,7 +7,7 @@
 
 - return unless branches.any?
 
-.card.gl-mt-3
+.card
   .card-header
     = panel_title
   %ul.content-list.all-branches.qa-all-branches

app/views/projects/branches/index.html.haml

@@ -27,11 +27,6 @@
 = render_if_exists 'projects/commits/mirror_status'
 
 .js-branch-list{ data: { diverging_counts_endpoint: diverging_commit_counts_namespace_project_branches_path(@project.namespace, @project, format: :json), default_branch: @project.default_branch } }
-- if can?(current_user, :admin_project, @project)
-  - project_settings_link = link_to s_('Branches|project settings'), project_protected_branches_path(@project)
-  .row-content-block
-    %h5
-      = s_('Branches|Protected branches can be managed in %{project_settings_link}.').html_safe % { project_settings_link: project_settings_link }
 
 - if @gitaly_unavailable
   = render 'shared/errors/gitaly_unavailable', reason: s_('Branches|Unable to load branches')

locale/gitlab.pot

@@ -6262,9 +6262,6 @@ msgstr ""
 msgid "Branches|Please type the following to confirm:"
 msgstr ""
 
-msgid "Branches|Protected branches can be managed in %{project_settings_link}."
-msgstr ""
-
 msgid "Branches|Show active branches"
 msgstr ""
 
@@ -6322,9 +6319,6 @@ msgstr ""
 msgid "Branches|merged"
 msgstr ""
 
-msgid "Branches|project settings"
-msgstr ""
-
 msgid "Branches|protected"
 msgstr ""
 

spec/features/projects/branches_spec.rb

@@ -199,14 +199,6 @@ RSpec.describe 'Branches' do
       project.add_maintainer(user)
     end
 
-    describe 'Initial branches page' do
-      it 'shows description for admin' do
-        visit project_branches_filtered_path(project, state: 'all')
-
-        expect(page).to have_content("Protected branches can be managed in project settings")
-      end
-    end
-
     it 'shows the merge request button' do
       visit project_branches_path(project)