Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
eb9c6731
Commit
eb9c6731
authored
May 14, 2021
by
Jeremy Elder
Committed by
Ezekiel Kigbo
May 14, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Audit and update buttons on Profiles::KeysController#get_keys"
parent
73f2dfc3
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
4 deletions
+18
-4
app/helpers/ssh_keys_helper.rb
app/helpers/ssh_keys_helper.rb
+4
-1
app/views/profiles/keys/_key.html.haml
app/views/profiles/keys/_key.html.haml
+1
-1
app/views/shared/ssh_keys/_key_delete.html.haml
app/views/shared/ssh_keys/_key_delete.html.haml
+5
-2
changelogs/unreleased/273304-fy21q4-foundations-kr2-audit-and-update-buttons-on-profiles-keysco.yml
...tions-kr2-audit-and-update-buttons-on-profiles-keysco.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
app/helpers/ssh_keys_helper.rb
View file @
eb9c6731
...
@@ -12,7 +12,10 @@ module SshKeysHelper
...
@@ -12,7 +12,10 @@ module SshKeysHelper
message:
_
(
'This action cannot be undone, and will permanently delete the %{key} SSH key'
)
%
{
key:
key
.
title
},
message:
_
(
'This action cannot be undone, and will permanently delete the %{key} SSH key'
)
%
{
key:
key
.
title
},
okVariant:
'danger'
,
okVariant:
'danger'
,
okTitle:
_
(
'Delete'
)
okTitle:
_
(
'Delete'
)
}
},
toggle:
'tooltip'
,
placement:
'top'
,
container:
'body'
}
}
end
end
end
end
app/views/profiles/keys/_key.html.haml
View file @
eb9c6731
...
@@ -28,4 +28,4 @@
...
@@ -28,4 +28,4 @@
%span
.key-created-at.gl-display-flex.gl-align-items-center
%span
.key-created-at.gl-display-flex.gl-align-items-center
-
if
key
.
can_delete?
-
if
key
.
can_delete?
.gl-ml-3
.gl-ml-3
=
render
'shared/ssh_keys/key_delete'
,
html_class:
"btn gl-button btn-icon btn-d
anger
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-d
efault
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
View file @
eb9c6731
-
title
=
_
(
'Delete Key'
)
-
aria
=
{
label:
title
}
-
if
defined?
(
text
)
-
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
-
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'
)
%span
.sr-only
=
_
(
'Delete'
)
=
sprite_icon
(
'remove'
)
=
sprite_icon
(
'remove'
)
changelogs/unreleased/273304-fy21q4-foundations-kr2-audit-and-update-buttons-on-profiles-keysco.yml
0 → 100644
View file @
eb9c6731
---
title
:
Updating button variant and adding tooltip for the SSH delete key button.
merge_request
:
61626
author
:
type
:
other
locale/gitlab.pot
View file @
eb9c6731
...
@@ -10593,6 +10593,9 @@ msgstr ""
...
@@ -10593,6 +10593,9 @@ msgstr ""
msgid "Delete Comment"
msgid "Delete Comment"
msgstr ""
msgstr ""
msgid "Delete Key"
msgstr ""
msgid "Delete Value Stream"
msgid "Delete Value Stream"
msgstr ""
msgstr ""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment