Commit 42abffcd authored by Denys Mishunov's avatar Denys Mishunov

Merge branch 'mjang-update-token-enforcement-tooltip' into 'master'

Revise note on token expiration and enforcement

See merge request gitlab-org/gitlab!40527
parents e41e9f33 567b7183
......@@ -35,7 +35,7 @@
%td
- if token.expires?
- if token.expires_at.past? || token.expires_at.today?
%span{ class: 'text-danger has-tooltip', title: _('Expiration not enforced') }
%span{ class: 'text-danger has-tooltip', title: _('Token valid until revoked') }
= _('Expired')
- else
%span{ class: ('text-warning' if token.expires_soon?) }
......
......@@ -10136,9 +10136,6 @@ msgstr ""
msgid "Expiration date"
msgstr ""
msgid "Expiration not enforced"
msgstr ""
msgid "Expired"
msgstr ""
......@@ -25980,6 +25977,9 @@ msgstr ""
msgid "Toggles :%{name}: emoji award."
msgstr ""
msgid "Token valid until revoked"
msgstr ""
msgid "Tomorrow"
msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment