From b76ae638462ab0f673e5915986070518dd3f9ad3 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 19 Aug 2021 09:08:42 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-2-stable-ee --- app/views/shared/access_tokens/_table.html.haml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'app/views/shared/access_tokens/_table.html.haml') diff --git a/app/views/shared/access_tokens/_table.html.haml b/app/views/shared/access_tokens/_table.html.haml index 1f08bff9858..33d6b9573d4 100644 --- a/app/views/shared/access_tokens/_table.html.haml +++ b/app/views/shared/access_tokens/_table.html.haml @@ -7,6 +7,7 @@ %h5 = _('Active %{type} (%{token_length})') % { type: type_plural, token_length: active_tokens.length } + - if personal && !personal_access_token_expiration_enforced? %p.profile-settings-content = _("Personal access tokens are not revoked upon expiration.") @@ -14,6 +15,9 @@ %p.profile-settings-content = _("To see all the user's personal access tokens you must impersonate them first.") +- if personal + = render_if_exists 'profiles/personal_access_tokens/token_expiry_notification', active_tokens: active_tokens + - if active_tokens.present? .table-responsive %table.table.active-tokens @@ -42,7 +46,7 @@ %span.token-never-used-label= _('Never') %td - if token.expires? - - if token.expires_at.past? || token.expires_at.today? + - if token.expired? || token.expired_but_not_enforced? %span{ class: 'text-danger has-tooltip', title: _('Token valid until revoked') } = _('Expired') - else -- cgit v1.2.1