Merge branch '231214-admin-deploy-key-buttons' into 'master'

Resolve "Apply GitLab UI button styles to buttons in app/views/admin/deploy_keys directory"

See merge request gitlab-org/gitlab!44361

app/views/admin/deploy_keys/edit.html.haml

@@ -6,5 +6,5 @@
   = form_for [:admin, @deploy_key], html: { class: 'deploy-key-form' } do |f|
     = render partial: 'shared/deploy_keys/form', locals: { form: f, deploy_key: @deploy_key }
     .form-actions
-      = f.submit _('Save changes'), class: 'btn-success btn'
-      = link_to _('Cancel'), admin_deploy_keys_path, class: 'btn btn-cancel'
+      = f.submit _('Save changes'), class: 'btn gl-button btn-success'
+      = link_to _('Cancel'), admin_deploy_keys_path, class: 'btn gl-button btn-cancel'

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

@@ -2,7 +2,7 @@
 - if @deploy_keys.any?
   %h3.page-title.deploy-keys-title
     = _('Public deploy keys (%{deploy_keys_count})') % { deploy_keys_count: @deploy_keys.load.size }
-    = link_to _('New deploy key'), new_admin_deploy_key_path, class: 'float-right btn btn-success btn-md gl-button'
+    = link_to _('New deploy key'), new_admin_deploy_key_path, class: 'float-right btn gl-button btn-success btn-md gl-button'
   .table-holder.deploy-keys-list
     %table.table
       %thead
@@ -27,7 +27,7 @@
                 = _('added %{created_at_timeago}').html_safe % { created_at_timeago: time_ago_with_tooltip(deploy_key.created_at) }
             %td
               .float-right
-                = link_to _('Edit'), edit_admin_deploy_key_path(deploy_key), class: 'btn btn-sm'
-                = link_to _('Remove'), admin_deploy_key_path(deploy_key), data: { confirm: _('Are you sure?') }, method: :delete, class: 'btn btn-sm btn-remove delete-key'
+                = link_to _('Edit'), edit_admin_deploy_key_path(deploy_key), class: 'btn gl-button btn-sm'
+                = link_to _('Remove'), admin_deploy_key_path(deploy_key), data: { confirm: _('Are you sure?') }, method: :delete, class: 'btn gl-button btn-sm btn-remove delete-key'
 - else
   = render 'shared/empty_states/deploy_keys'

app/views/admin/deploy_keys/new.html.haml

@@ -6,5 +6,5 @@
   = form_for [:admin, @deploy_key], html: { class: 'deploy-key-form' } do |f|
     = render partial: 'shared/deploy_keys/form', locals: { form: f, deploy_key: @deploy_key }
     .form-actions
-      = f.submit 'Create', class: 'btn-success btn'
-      = link_to 'Cancel', admin_deploy_keys_path, class: 'btn btn-cancel'
+      = f.submit 'Create', class: 'btn gl-button btn-success'
+      = link_to 'Cancel', admin_deploy_keys_path, class: 'btn gl-button btn-cancel'

changelogs/unreleased/231214-admin-deploy-key-buttons.yml

+---
+title: Update buttons to use GitLab button class gl-button
+merge_request: 44361
+author: Gary Bell @garybell
+type: other