Merge branch 'btn-confirm-app-settings' into 'master'

Move to btn-confirm from btn-success in application_settings directory

See merge request gitlab-org/gitlab!58025

ee/app/views/admin/application_settings/_custom_templates_form.html.haml

@@ -16,4 +16,4 @@
           .form-group
             = groups_select_tag('application_setting[custom_project_templates_group_id]', selected: @application_setting.custom_project_templates_group_id, class: 'input-clamp allowClear qa-custom-project-template-select', multiple: false)
 
-        = f.submit _('Save changes'), class: "gl-button btn btn-success qa-save-changes-button"
+        = f.submit _('Save changes'), class: "gl-button btn btn-confirm qa-save-changes-button"

ee/app/views/admin/application_settings/_ee_package_registry.haml

@@ -11,4 +11,4 @@
             .form-text.text-muted
               = _("When enabled, if an npm package isn't found in the GitLab Registry, we will attempt to pull from the global npm registry.")
 
-    = f.submit _('Save changes'), class: 'btn gl-button btn-success'
+    = f.submit _('Save changes'), class: 'btn gl-button btn-confirm'

ee/app/views/admin/application_settings/_elasticsearch_form.html.haml

@@ -44,7 +44,7 @@
                 - if Gitlab::CurrentSettings.elasticsearch_indexing?
                   .form-text
                     = link_to _('Index all projects'), admin_elasticsearch_enqueue_index_path,
-                        class: ['btn', 'btn-success'], method: :post
+                        class: ['gl-button', 'btn', 'btn-confirm'], method: :post
 
             .gl-card-body
               .form-group
@@ -234,4 +234,4 @@
               .form-text.gl-text-gray-600.gl-mt-0
                 = _('AWS Secret Access Key. Only required if not using role instance credentials')
 
-      = f.submit _('Save changes'), class: "gl-button btn btn-success", data: { qa_selector: 'submit_button' }
+      = f.submit _('Save changes'), class: "gl-button btn btn-confirm", data: { qa_selector: 'submit_button' }

ee/app/views/admin/application_settings/_network_incident_management.html.haml

@@ -16,4 +16,4 @@
       = f.label :throttle_incident_management_notification_per_period, 'Rate limit period in seconds', class: 'label-bold'
       = f.number_field :throttle_incident_management_notification_per_period, class: 'form-control gl-form-input'
 
-  = f.submit 'Save changes', class: "gl-button btn btn-success"
+  = f.submit 'Save changes', class: "gl-button btn btn-confirm"

ee/app/views/admin/application_settings/_pseudonymizer.html.haml

@@ -15,4 +15,4 @@
             - else
               = pseudonymizer_disabled_description_text
 
-  = f.submit 'Save changes', class: "gl-button btn btn-success"
+  = f.submit 'Save changes', class: "gl-button btn btn-confirm"

ee/app/views/admin/application_settings/_required_instance_ci_setting.html.haml

@@ -22,4 +22,4 @@
           = dropdown_tag(s_('AdminSettings|No required pipeline'), options: { toggle_class: 'js-ci-template-dropdown dropdown-select', title: s_('AdminSettings|Select a template'), filter: true, placeholder: _("Filter"), data: { data: gitlab_ci_ymls(nil) } } )
           = f.text_field :required_instance_ci_template, value: @application_setting.required_instance_ci_template, id: 'required_instance_ci_template_name', class: 'hidden'
 
-      = f.submit _('Save changes'), class: "gl-button btn btn-success"
+      = f.submit _('Save changes'), class: "gl-button btn btn-confirm"

ee/app/views/admin/application_settings/_seat_link_form.html.haml

@@ -28,4 +28,4 @@
             - link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: link_path }
             = s_('For more information, see the documentation on %{link_start}disabling Seat Link%{link_end}.').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
 
-  = f.submit 'Save changes', class: "gl-button btn btn-success"
+  = f.submit 'Save changes', class: "gl-button btn btn-confirm"

ee/app/views/admin/application_settings/_slack.html.haml

@@ -31,4 +31,4 @@
           = f.label :slack_app_verification_token, 'Verification token', class: 'label-bold'
           = f.text_field :slack_app_verification_token, class: 'form-control gl-form-input'
 
-      = f.submit _('Save changes'), class: "gl-button btn btn-success"
+      = f.submit _('Save changes'), class: "gl-button btn btn-confirm"

ee/app/views/admin/application_settings/_templates.html.haml

@@ -19,4 +19,4 @@
                 = link_to 'template repository', help_page_path("user/admin_area/settings/instance_template_repository")
             = project_select_tag('application_setting[file_template_project_id]', class: 'project-item-select hidden-filter-value', toggle_class: 'js-project-search js-project-filter js-filter-submit', dropdown_class: 'dropdown-menu-selectable dropdown-menu-project js-filter-submit',
               placeholder: _('Search projects'), idAttribute: 'id', data: { order_by: 'last_activity_at', idattribute: 'id', all_projects: 'true', simple_filter: true, allow_clear: true }, value: @application_setting.file_template_project_id)
-        = f.submit 'Save changes', class: "gl-button btn btn-success"
+        = f.submit 'Save changes', class: "gl-button btn btn-confirm"

ee/changelogs/unreleased/btn-confirm-app-settings.yml

+---
+title: Move to btn-confirm from btn-success in application_settings directory
+merge_request: 58025
+author: Yogi (@yo)
+type: changed

ee/spec/views/admin/application_settings/_elasticsearch_form.html.haml_spec.rb

@@ -31,7 +31,7 @@ RSpec.describe 'admin/application_settings/_elasticsearch_form' do
       it 'hides index button when indexing is disabled' do
         render
 
-        expect(rendered).to have_css('a.btn-success', text: button_text)
+        expect(rendered).to have_css('a.btn-confirm', text: button_text)
       end
 
       it 'renders an enabled pause checkbox' do
@@ -59,7 +59,7 @@ RSpec.describe 'admin/application_settings/_elasticsearch_form' do
       it 'shows index button when indexing is enabled' do
         render
 
-        expect(rendered).not_to have_css('a.btn-success', text: button_text)
+        expect(rendered).not_to have_css('a.btn-confirm', text: button_text)
       end
 
       it 'renders a disabled pause checkbox' do