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
a14ab73d
Commit
a14ab73d
authored
Nov 13, 2020
by
Miguel Rincon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove brackets in "no scopes selected" message
parent
19b26b12
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
5 deletions
+10
-5
app/views/shared/access_tokens/_table.html.haml
app/views/shared/access_tokens/_table.html.haml
+1
-1
app/views/shared/deploy_tokens/_table.html.haml
app/views/shared/deploy_tokens/_table.html.haml
+1
-1
changelogs/unreleased/247476-remove-angle-brackets-in-no-scopes.yml
.../unreleased/247476-remove-angle-brackets-in-no-scopes.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-3
No files found.
app/views/shared/access_tokens/_table.html.haml
View file @
a14ab73d
...
...
@@ -42,7 +42,7 @@
=
_
(
'In %{time_to_now}'
)
%
{
time_to_now:
distance_of_time_in_words_to_now
(
token
.
expires_at
)
}
-
else
%span
.token-never-expires-label
=
_
(
'Never'
)
%td
=
token
.
scopes
.
present?
?
token
.
scopes
.
join
(
', '
)
:
html_escape_once
(
_
(
'<no scopes selected>'
)).
html_safe
%td
=
token
.
scopes
.
present?
?
token
.
scopes
.
join
(
', '
)
:
_
(
'no scopes selected'
)
%td
=
link_to
_
(
'Revoke'
),
revoke_route_helper
.
call
(
token
),
method: :put
,
class:
'btn btn-danger float-right qa-revoke-button'
,
data:
{
confirm:
_
(
'Are you sure you want to revoke this %{type}? This action cannot be undone.'
)
%
{
type:
type
}
}
-
else
.settings-message.text-center
...
...
app/views/shared/deploy_tokens/_table.html.haml
View file @
a14ab73d
...
...
@@ -23,7 +23,7 @@
In
#{
distance_of_time_in_words_to_now
(
token
.
expires_at
)
}
-
else
%span
.token-never-expires-label
=
_
(
'Never'
)
%td
=
token
.
scopes
.
present?
?
token
.
scopes
.
join
(
", "
)
:
html_escape_once
(
_
(
'<no scopes selected>'
)).
html_safe
%td
=
token
.
scopes
.
present?
?
token
.
scopes
.
join
(
', '
)
:
_
(
'no scopes selected'
)
%td
=
link_to
s_
(
'DeployTokens|Revoke'
),
"#"
,
class:
"btn btn-danger float-right"
,
data:
{
toggle:
"modal"
,
target:
"#revoke-modal-
#{
token
.
id
}
"
}
=
render
'shared/deploy_tokens/revoke_modal'
,
token:
token
,
group_or_project:
group_or_project
-
else
...
...
changelogs/unreleased/247476-remove-angle-brackets-in-no-scopes.yml
0 → 100644
View file @
a14ab73d
---
title
:
Remove brackets in no scopes selected message in access and deploy tokens lists
merge_request
:
47628
author
:
type
:
changed
locale/gitlab.pot
View file @
a14ab73d
...
...
@@ -911,9 +911,6 @@ msgstr ""
msgid "< 1 hour"
msgstr ""
msgid "<no scopes selected>"
msgstr ""
msgid "'%{data}' at %{location} does not match format: %{format}"
msgstr ""
...
...
@@ -32851,6 +32848,9 @@ msgstr ""
msgid "no one can merge"
msgstr ""
msgid "no scopes selected"
msgstr ""
msgid "none"
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