Commit f07f3af5 authored by Ezekiel Kigbo's avatar Ezekiel Kigbo

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
parents 09f5face eb9c6731
......@@ -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
......@@ -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))
- 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')
---
title: Updating button variant and adding tooltip for the SSH delete key button.
merge_request: 61626
author:
type: other
......@@ -10599,6 +10599,9 @@ msgstr ""
msgid "Delete Comment"
msgstr ""
msgid "Delete Key"
msgstr ""
msgid "Delete Value Stream"
msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment