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
567b7183
Commit
567b7183
authored
Aug 26, 2020
by
Mike Jang
Committed by
Denys Mishunov
Aug 26, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revise note on token expiration and enforcement
parent
a0efb830
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/views/shared/access_tokens/_table.html.haml
app/views/shared/access_tokens/_table.html.haml
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+3
-3
No files found.
app/views/shared/access_tokens/_table.html.haml
View file @
567b7183
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
%td
%td
-
if
token
.
expires?
-
if
token
.
expires?
-
if
token
.
expires_at
.
past?
||
token
.
expires_at
.
today?
-
if
token
.
expires_at
.
past?
||
token
.
expires_at
.
today?
%span
{
class:
'text-danger has-tooltip'
,
title:
_
(
'
Expiration not enforc
ed'
)
}
%span
{
class:
'text-danger has-tooltip'
,
title:
_
(
'
Token valid until revok
ed'
)
}
=
_
(
'Expired'
)
=
_
(
'Expired'
)
-
else
-
else
%span
{
class:
(
'text-warning'
if
token
.
expires_soon?
)
}
%span
{
class:
(
'text-warning'
if
token
.
expires_soon?
)
}
...
...
locale/gitlab.pot
View file @
567b7183
...
@@ -10136,9 +10136,6 @@ msgstr ""
...
@@ -10136,9 +10136,6 @@ msgstr ""
msgid "Expiration date"
msgid "Expiration date"
msgstr ""
msgstr ""
msgid "Expiration not enforced"
msgstr ""
msgid "Expired"
msgid "Expired"
msgstr ""
msgstr ""
...
@@ -25980,6 +25977,9 @@ msgstr ""
...
@@ -25980,6 +25977,9 @@ msgstr ""
msgid "Toggles :%{name}: emoji award."
msgid "Toggles :%{name}: emoji award."
msgstr ""
msgstr ""
msgid "Token valid until revoked"
msgstr ""
msgid "Tomorrow"
msgid "Tomorrow"
msgstr ""
msgstr ""
...
...
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