Merge branch 'gl-button-repository-settings' into 'master'

Apply new GitLab UI for button is project settings/repository page

See merge request gitlab-org/gitlab!53346

app/views/projects/cleanup/_show.html.haml

@@ -3,7 +3,7 @@
 %section.settings.no-animate#cleanup{ class: ('expanded' if expanded) }
   .settings-header
     %h4= _('Repository cleanup')
-    %button.btn.js-settings-toggle
+    %button.btn.gl-button.btn-default.js-settings-toggle
       = expanded ? _('Collapse') : _('Expand')
     %p
       - link_url = 'https://github.com/newren/git-filter-repo'

app/views/projects/default_branch/_show.html.haml

@@ -3,7 +3,7 @@
 %section.settings.no-animate#default-branch-settings{ class: ('expanded' if expanded) }
   .settings-header
     %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only= _('Default branch')
-    %button.btn.js-settings-toggle
+    %button.btn.gl-button.btn-default.js-settings-toggle
       = expanded ? _('Collapse') : _('Expand')
     %p
       = _('Set the default branch for this project. All merge requests and commits are made against this branch unless you specify a different one.')

app/views/projects/mirrors/_mirror_repos.html.haml

@@ -6,7 +6,7 @@
 %section.settings.project-mirror-settings.no-animate#js-push-remote-settings{ class: mirror_settings_class, data: { qa_selector: 'mirroring_repositories_settings_content' } }
   .settings-header
     %h4= _('Mirroring repositories')
-    %button.btn.gl-button.js-settings-toggle
+    %button.btn.gl-button.btn-default.js-settings-toggle
       = expanded ? _('Collapse') : _('Expand')
     %p
       = _('Set up your project to automatically push and/or pull changes to/from another repository. Branches, tags, and commits will be synced automatically.')

app/views/projects/protected_branches/shared/_index.html.haml

@@ -4,7 +4,7 @@
   .settings-header
     %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only
       Protected branches
-    %button.btn.gl-button.js-settings-toggle.qa-expand-protected-branches{ type: 'button' }
+    %button.btn.gl-button.btn-default.js-settings-toggle.qa-expand-protected-branches{ type: 'button' }
       = expanded ? 'Collapse' : 'Expand'
     %p
       Keep stable branches secure, and force developers to use merge requests. #{link_to "What are protected branches?", help_page_path("user/project/protected_branches")}

app/views/projects/protected_tags/shared/_index.html.haml

@@ -4,7 +4,7 @@
   .settings-header
     %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only
       Protected tags
-    %button.btn.js-settings-toggle{ type: 'button' }
+    %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
       = expanded ? 'Collapse' : 'Expand'
     %p
       Limit access to creating and updating tags. #{link_to "What are protected tags?", help_page_path("user/project/protected_tags")}

app/views/shared/deploy_keys/_index.html.haml

@@ -2,7 +2,7 @@
 %section.qa-deploy-keys-settings.settings.no-animate#js-deploy-keys-settings{ class: ('expanded' if expanded), data: { qa_selector: 'deploy_keys_settings_content' } }
   .settings-header
     %h4= _('Deploy keys')
-    %button.btn.js-settings-toggle{ type: 'button' }
+    %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
       = expanded ? 'Collapse' : 'Expand'
     %p
       - link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: help_page_path('user/project/deploy_keys/index') }

app/views/shared/deploy_tokens/_index.html.haml

@@ -3,7 +3,7 @@
 %section.qa-deploy-tokens-settings.settings.no-animate#js-deploy-tokens{ class: ('expanded' if expanded), data: { qa_selector: 'deploy_tokens_settings_content' } }
   .settings-header
     %h4= s_('DeployTokens|Deploy tokens')
-    %button.gl-button.btn.js-settings-toggle.qa-expand-deploy-keys{ type: 'button' }
+    %button.btn.gl-button.btn-default.js-settings-toggle.qa-expand-deploy-keys{ type: 'button' }
       = expanded ? 'Collapse' : 'Expand'
     %p
       = description

changelogs/unreleased/gl-button-repository-settings.yml

+---
+title: Apply new GitLab UI for button is project settings/repository page
+merge_request: 53346
+author: Yogi (@yo)
+type: other

ee/app/views/projects/mirrors/_table_pull_row.html.haml

@@ -25,6 +25,6 @@
       - elsif @project.archived?
         %button.btn.btn-icon.gl-button.disabled{ type: 'button', data: { container: 'body', toggle: 'tooltip', qa_selector: 'update_now_button' }, title: _('This Project is currently archived and read-only. Please unarchive the project first if you want to resume Pull mirroring') }= sprite_icon("retry")
       - else
-        = link_to update_now_project_mirror_path(@project), method: :post, class: 'btn gl-button btn-icon js-force-update-mirror', data: { container: 'body', toggle: 'tooltip', qa_selector: 'update_now_button' }, title: _('Update now') do
+        = link_to update_now_project_mirror_path(@project), method: :post, class: 'btn gl-button btn-icon btn-default js-force-update-mirror', data: { container: 'body', toggle: 'tooltip', qa_selector: 'update_now_button' }, title: _('Update now') do
           = sprite_icon("retry")
       %button.js-delete-mirror.js-delete-pull-mirror.btn.btn-icon.gl-button.btn-danger{ type: 'button', data: { toggle: 'tooltip', container: 'body' }, title: _('Remove') }= sprite_icon('remove')

ee/app/views/shared/push_rules/_form.html.haml

@@ -61,4 +61,4 @@
   .form-text.text-muted
     = s_('PushRules|Reject file sizes equal to or greater than this size. If set to 0, files of any size are allowed. This rule does not apply to files tracked by Git LFS.')
 
-= f.submit s_("PushRules|Save Push Rules"), class: "btn btn-success", data: { qa_selector: 'submit_settings_button' }
+= f.submit s_("PushRules|Save push rules"), class: "btn gl-button btn-success", data: { qa_selector: 'submit_settings_button' }

ee/spec/features/admin/admin_interacts_with_push_rules_spec.rb

@@ -47,7 +47,7 @@ RSpec.describe "Admin interacts with push rules" do
 
     it "creates new rule" do
       fill_in("Require expression in commit messages", with: "my_string")
-      click_button("Save Push Rules")
+      click_button("Save push rules")
 
       expect(page).to have_selector("input[value='my_string']")
     end

ee/spec/features/projects/settings/push_rules_settings_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe 'Project settings > [EE] repository' do
         visit project_settings_repository_path(project)
 
         fill_in input_id, with: commit_message
-        click_button 'Save Push Rules'
+        click_button 'Save push rules'
       end
 
       it 'displays the new value in the form' do

locale/gitlab.pot

@@ -24605,7 +24605,7 @@ msgstr ""
 msgid "PushRules|Restrict push operations for this project."
 msgstr ""
 
-msgid "PushRules|Save Push Rules"
+msgid "PushRules|Save push rules"
 msgstr ""
 
 msgid "PushRules|Select push rules"