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
8da90045
Commit
8da90045
authored
Apr 15, 2021
by
Jiaan Louw
Committed by
Kerri Miller
Apr 15, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refer to expired SSH keys in the past tense
parent
c53f5088
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
1 deletion
+23
-1
app/views/profiles/keys/_key.html.haml
app/views/profiles/keys/_key.html.haml
+1
-1
changelogs/unreleased/326995-refer-to-expired-ssh-keys-in-the-past-tense.yml
...ed/326995-refer-to-expired-ssh-keys-in-the-past-tense.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
spec/views/profiles/keys/_key.html.haml_spec.rb
spec/views/profiles/keys/_key.html.haml_spec.rb
+14
-0
No files found.
app/views/profiles/keys/_key.html.haml
View file @
8da90045
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
=
s_
(
'Profiles|Last used:'
)
=
s_
(
'Profiles|Last used:'
)
=
key
.
last_used_at
?
time_ago_with_tooltip
(
key
.
last_used_at
)
:
_
(
'Never'
)
=
key
.
last_used_at
?
time_ago_with_tooltip
(
key
.
last_used_at
)
:
_
(
'Never'
)
%span
.expires.gl-mr-3
%span
.expires.gl-mr-3
=
s_
(
'Profiles|Expires:'
)
=
key
.
expired?
?
s_
(
'Profiles|Expired:'
)
:
s_
(
'Profiles|Expires:'
)
=
key
.
expires_at
?
key
.
expires_at
.
to_date
:
_
(
'Never'
)
=
key
.
expires_at
?
key
.
expires_at
.
to_date
:
_
(
'Never'
)
%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?
...
...
changelogs/unreleased/326995-refer-to-expired-ssh-keys-in-the-past-tense.yml
0 → 100644
View file @
8da90045
---
title
:
Update profile SSH key labels to refer to expired keys as "Expired"
merge_request
:
59381
author
:
type
:
changed
locale/gitlab.pot
View file @
8da90045
...
@@ -24152,6 +24152,9 @@ msgstr ""
...
@@ -24152,6 +24152,9 @@ msgstr ""
msgid "Profiles|Expired key is not valid."
msgid "Profiles|Expired key is not valid."
msgstr ""
msgstr ""
msgid "Profiles|Expired:"
msgstr ""
msgid "Profiles|Expires at"
msgid "Profiles|Expires at"
msgstr ""
msgstr ""
...
...
spec/views/profiles/keys/_key.html.haml_spec.rb
View file @
8da90045
...
@@ -58,6 +58,20 @@ RSpec.describe 'profiles/keys/_key.html.haml' do
...
@@ -58,6 +58,20 @@ RSpec.describe 'profiles/keys/_key.html.haml' do
end
end
end
end
context
'when the key has expired'
do
let_it_be
(
:key
)
do
create
(
:personal_key
,
user:
user
,
expires_at:
2
.
days
.
ago
)
end
it
'renders "Expired:" as the expiration date label'
do
render
expect
(
rendered
).
to
have_text
(
'Expired:'
)
end
end
context
'when the key is not deletable'
do
context
'when the key is not deletable'
do
# Turns out key.can_delete? is only false for LDAP keys
# Turns out key.can_delete? is only false for LDAP keys
# but LDAP keys don't exist outside EE
# but LDAP keys don't exist outside EE
...
...
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