summaryrefslogtreecommitdiff
path: root/app/views/shared/access_tokens/_table.html.haml
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/shared/access_tokens/_table.html.haml')
-rw-r--r--app/views/shared/access_tokens/_table.html.haml6
1 files changed, 5 insertions, 1 deletions
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