diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-31 15:11:37 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-31 15:11:37 +0300 |
commit | c62dd5ae440db9ad4696000a863fbcb53fe83498 (patch) | |
tree | 3e4c18cd7a475e6d81f80335d173f1eb3f9510d8 /app/views | |
parent | aa88b9053d72f3f9b69ae5365b77595dcae5c0c3 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/profiles/keys/_key.html.haml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/views/profiles/keys/_key.html.haml b/app/views/profiles/keys/_key.html.haml index b4b205bc52a..825fb98782a 100644 --- a/app/views/profiles/keys/_key.html.haml +++ b/app/views/profiles/keys/_key.html.haml @@ -21,7 +21,12 @@ .key-list-item-dates %span.last-used-at.gl-mr-3 = s_('Profiles|Last used:') - = key.last_used_at ? time_ago_with_tooltip(key.last_used_at) : _('Never') + -# TODO: Remove this conditional when https://gitlab.com/gitlab-org/gitlab/-/issues/324764 is resolved. + - if Feature.enabled?(:disable_ssh_key_used_tracking) + = _('Unavailable') + = link_to sprite_icon('question-o'), help_page_path('user/ssh.md', anchor: 'view-your-accounts-ssh-keys') + - else + = key.last_used_at ? time_ago_with_tooltip(key.last_used_at) : _('Never') %span.expires.gl-mr-3 = key.expired? ? s_('Profiles|Expired:') : s_('Profiles|Expires:') = key.expires_at ? key.expires_at.to_date : _('Never') |