Merge branch...

Merge branch '273304-fy21q4-foundations-kr2-audit-and-update-buttons-on-profiles-keyscontroller-get_keys' into 'master'

Audit and update buttons on Profiles::KeysController#get_keys"

See merge request gitlab-org/gitlab!61626

app/helpers/ssh_keys_helper.rb

@@ -12,7 +12,10 @@ module SshKeysHelper
             message: _('This action cannot be undone, and will permanently delete the %{key} SSH key') % { key: key.title },
             okVariant: 'danger',
             okTitle: _('Delete')
-        }
+        },
+        toggle: 'tooltip',
+        placement: 'top',
+        container: 'body'
     }
   end
 end

app/views/profiles/keys/_key.html.haml

@@ -28,4 +28,4 @@
     %span.key-created-at.gl-display-flex.gl-align-items-center
       - if key.can_delete?
         .gl-ml-3
-          = render 'shared/ssh_keys/key_delete', html_class: "btn gl-button btn-icon btn-danger js-confirm-modal-button", button_data: ssh_key_delete_modal_data(key, path_to_key(key, is_admin))
+          = render 'shared/ssh_keys/key_delete', html_class: "btn gl-button btn-icon btn-default js-confirm-modal-button", button_data: ssh_key_delete_modal_data(key, path_to_key(key, is_admin))

app/views/shared/ssh_keys/_key_delete.html.haml

+- title = _('Delete Key')
+- aria = { label: title }
+
 - if defined?(text)
-  = button_to text, '#', class: html_class, data: button_data
+  = button_to text, '#', class: html_class, data: button_data, title: title, aria: aria
 - else
-  = button_to '#', class: html_class, data: button_data do
+  = button_to '#', class: html_class, data: button_data, title: title, aria: aria do
     %span.sr-only= _('Delete')
     = sprite_icon('remove')

changelogs/unreleased/273304-fy21q4-foundations-kr2-audit-and-update-buttons-on-profiles-keysco.yml

+---
+title: Updating button variant and adding tooltip for the SSH delete key button.
+merge_request: 61626
+author:
+type: other

locale/gitlab.pot

@@ -10599,6 +10599,9 @@ msgstr ""
 msgid "Delete Comment"
 msgstr ""
 
+msgid "Delete Key"
+msgstr ""
+
 msgid "Delete Value Stream"
 msgstr ""