Merge branch 'yo-btn-info-fix' into 'master'

Move btn-primary to btn-confirm class as a part of Pajamas migration

See merge request gitlab-org/gitlab!52090

app/assets/javascripts/ide/components/preview/clientside.vue

@@ -165,7 +165,7 @@ export default {
       </p>
       <a
         :href="links.webIDEHelpPagePath"
-        class="btn btn-primary"
+        class="btn gl-button btn-confirm"
         target="_blank"
         rel="noopener noreferrer"
       >

app/views/admin/applications/show.html.haml

@@ -45,5 +45,5 @@
     = render "shared/tokens/scopes_list", token: @application
 
 .form-actions
-  = link_to 'Edit', edit_admin_application_path(@application), class: 'gl-button btn btn-primary wide float-left'
-  = render 'delete_form', application: @application, submit_btn_css: 'btn btn-danger gl-ml-3'
+  = link_to 'Edit', edit_admin_application_path(@application), class: 'gl-button btn btn-confirm wide float-left'
+  = render 'delete_form', application: @application, submit_btn_css: 'gl-button btn btn-danger gl-ml-3'

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

@@ -32,6 +32,6 @@
       = render 'shared/projects/dropdown'
       = link_to new_project_path, class: 'gl-button btn btn-success' do
         New Project
-      = button_tag "Search", class: "gl-button btn btn-primary btn-search hide"
+      = button_tag "Search", class: "gl-button btn btn-confirm btn-search hide"
 
 = render 'projects'

app/views/admin/projects/show.html.haml

@@ -150,7 +150,7 @@
 
           .form-group.row
             .offset-sm-3.col-sm-9
-              = f.submit _('Transfer'), class: 'gl-button btn btn-primary'
+              = f.submit _('Transfer'), class: 'gl-button btn btn-confirm'
 
     .card.repository-check
       .card-header
@@ -170,7 +170,7 @@
             = link_to sprite_icon('question-o'), help_page_path('administration/repository_checks')
 
           .form-group
-            = f.submit _('Trigger repository check'), class: 'gl-button btn btn-primary'
+            = f.submit _('Trigger repository check'), class: 'gl-button btn btn-confirm'
 
   .col-md-6
     - if @group

app/views/devise/passwords/edit.html.haml

@@ -12,7 +12,7 @@
         = f.label 'Confirm new password', for: "user_password_confirmation"
         = f.password_field :password_confirmation, class: "form-control gl-form-input bottom", title: 'This field is required', data: { qa_selector: 'password_confirmation_field' }, required: true
       .clearfix
-        = f.submit "Change your password", class: "gl-button btn btn-info", data: { qa_selector: 'change_password_button' }
+        = f.submit "Change your password", class: "gl-button btn btn-confirm", data: { qa_selector: 'change_password_button' }
 
 .clearfix.prepend-top-20
   %p

app/views/devise/passwords/new.html.haml

@@ -7,7 +7,7 @@
         = f.label :email
         = f.email_field :email, class: "form-control gl-form-input", required: true, value: params[:user_email], autofocus: true, title: 'Please provide a valid email address.'
       .clearfix
-        = f.submit "Reset password", class: "gl-button btn-info btn"
+        = f.submit "Reset password", class: "gl-button btn-confirm btn"
 
 .clearfix.prepend-top-20
   = render 'devise/shared/sign_in_link'

app/views/doorkeeper/applications/show.html.haml

@@ -43,5 +43,5 @@
     = render "shared/tokens/scopes_list", token: @application
 
 .form-actions
-  = link_to _('Edit'), edit_oauth_application_path(@application), class: 'gl-button btn btn-primary wide float-left'
-  = render 'delete_form', application: @application, submit_btn_css: 'btn btn-danger gl-ml-3'
+  = link_to _('Edit'), edit_oauth_application_path(@application), class: 'gl-button btn btn-confirm wide float-left'
+  = render 'delete_form', application: @application, submit_btn_css: 'gl-button btn btn-danger gl-ml-3'

app/views/profiles/show.html.haml

@@ -141,12 +141,12 @@
           %img.modal-profile-crop-image{ alt: s_("Profiles|Avatar cropper") }
         .crop-controls
           .btn-group
-            %button.btn.btn-primary{ data: { method: 'zoom', option: '-0.1' } }
+            %button.btn.gl-button.btn-confirm{ data: { method: 'zoom', option: '-0.1' } }
               %span
                 = sprite_icon('search-minus')
-            %button.btn.btn-primary{ data: { method: 'zoom', option: '0.1' } }
+            %button.btn.gl-button.btn-confirm{ data: { method: 'zoom', option: '0.1' } }
               %span
                 = sprite_icon('search-plus')
       .modal-footer
-        %button.btn.btn-primary.js-upload-user-avatar{ type: 'button' }
+        %button.btn.gl-button.btn-confirm.js-upload-user-avatar{ type: 'button' }
           = s_("Profiles|Set new profile picture")

app/views/projects/buttons/_download_links.html.haml

 .btn-group.ml-0.w-100
   - Gitlab::Workhorse::ARCHIVE_FORMATS.each_with_index do |fmt, index|
     - archive_path = project_archive_path(project, id: tree_join(ref, archive_prefix), path: path, format: fmt)
-    = link_to fmt, external_storage_url_or_path(archive_path), rel: 'nofollow', download: '', class: "gl-button btn btn-xs #{"btn-primary" if index == 0}"
+    = link_to fmt, external_storage_url_or_path(archive_path), rel: 'nofollow', download: '', class: "gl-button btn btn-xs #{"btn-confirm" if index == 0}"

app/views/projects/merge_requests/_commits.html.haml

@@ -8,7 +8,7 @@
     - if @project&.context_commits_enabled? && can_update_merge_request
       %p
         = _('Push commits to the source branch or add previously merged commits to review them.')
-      %button.btn.btn-primary.add-review-item-modal-trigger{ type: "button", data: { commits_empty: 'true', context_commits_empty: 'true' } }
+      %button.btn.gl-button.btn-confirm.add-review-item-modal-trigger{ type: "button", data: { commits_empty: 'true', context_commits_empty: 'true' } }
         = _('Add previously merged commits')
 - else
   %ol#commits-list.list-unstyled

app/views/sent_notifications/unsubscribe.html.haml

@@ -15,5 +15,5 @@
 
 %p
   = link_to _('Unsubscribe'), unsubscribe_sent_notification_path(@sent_notification, force: true),
-            class: 'gl-button btn btn-primary gl-mr-3'
+            class: 'gl-button btn btn-confirm gl-mr-3'
   = link_to _('Cancel'), new_user_session_path, class: 'gl-button btn gl-mr-3'

changelogs/unreleased/yo-btn-info-fix.yml

+---
+title: Move btn-primary to btn-confirm class as a part of Pajamas migration
+merge_request: 52090
+author: Yogi (@yo)
+type: changed

ee/app/views/admin/licenses/_upload_trial_license.html.haml

@@ -25,4 +25,4 @@
               = license_key
             .modal-footer.form-actions
               %button.btn.gl-button.btn-default{ type: 'button', data: { dismiss: 'modal' } } Cancel
-              = f.submit 'Install license', class: 'gl-button btn btn-primary'
+              = f.submit 'Install license', class: 'gl-button btn btn-confirm'

ee/app/views/admin/licenses/new.html.haml

@@ -56,4 +56,4 @@
         = _('Unless otherwise agreed to in writing with GitLab, by clicking "Upload License" you agree that your use of GitLab Software is subject to the %{eula_link_start}Terms of Service%{eula_link_end}.').html_safe % { eula_link_start: eula_link_start, eula_url: eula_url, eula_link_end: '</a>'.html_safe }
 
   .form-actions
-    = f.submit 'Upload License', class: 'gl-button btn btn-primary', disabled: true, id: 'js-upload-license'
+    = f.submit 'Upload License', class: 'gl-button btn btn-confirm', disabled: true, id: 'js-upload-license'

ee/app/views/groups/saml_providers/_scim_token.html.haml

@@ -9,7 +9,7 @@
     .form-text.text-muted.js-scim-token-helper-text
       %span
         = s_('GroupSAML|The SCIM token is now hidden. To see the value of the token again, you need to ')
-        %button.btn.gl-button.btn-primary.btn-link.d-inline.align-baseline.js-reset-scim-token{ type: 'button' }
+        %button.btn.gl-button.btn-confirm.btn-link.d-inline.align-baseline.js-reset-scim-token{ type: 'button' }
           = _('reset it.')
       %span.d-none
         = s_("GroupSAML|Make sure you save this token — you won't be able to access it again.")