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
c673028a
Commit
c673028a
authored
Feb 13, 2021
by
Cynthia Ng
Committed by
Stan Hu
Feb 13, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move GMA user admin badging to EE
parent
5f67ce3e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
6 deletions
+12
-6
app/views/admin/users/_head.html.haml
app/views/admin/users/_head.html.haml
+1
-3
changelogs/unreleased/321447-fix-foss.yml
changelogs/unreleased/321447-fix-foss.yml
+5
-0
ee/app/views/admin/users/_gma_user_badge.html.haml
ee/app/views/admin/users/_gma_user_badge.html.haml
+3
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-3
No files found.
app/views/admin/users/_head.html.haml
View file @
c673028a
...
...
@@ -6,9 +6,6 @@
-
elsif
@user
.
blocked?
%span
.cred
=
s_
(
'AdminUsers|(Blocked)'
)
-
if
@user
.
group_managed_account?
%span
.cred
=
s_
(
'AdminUsers|(Group Managed Account)'
)
-
if
@user
.
internal?
%span
.cred
=
s_
(
'AdminUsers|(Internal)'
)
...
...
@@ -19,6 +16,7 @@
%span
.cred
=
s_
(
'AdminUsers|(Deactivated)'
)
=
render_if_exists
'admin/users/auditor_user_badge'
=
render_if_exists
'admin/users/gma_user_badge'
.float-right
-
if
impersonation_enabled?
&&
@user
!=
current_user
&&
@user
.
can?
(
:log_in
)
...
...
changelogs/unreleased/321447-fix-foss.yml
0 → 100644
View file @
c673028a
---
title
:
Move GMA user badging in admin to EE only
merge_request
:
54125
author
:
type
:
fixed
ee/app/views/admin/users/_gma_user_badge.html.haml
0 → 100644
View file @
c673028a
-
if
@user
.
group_managed_account?
%span
.cred
=
s_
(
'(Group Managed Account)'
)
locale/gitlab.pot
View file @
c673028a
...
...
@@ -988,6 +988,9 @@ msgstr ""
msgid "(+%{count} rules)"
msgstr ""
msgid "(Group Managed Account)"
msgstr ""
msgid "(No changes)"
msgstr ""
...
...
@@ -2253,9 +2256,6 @@ msgstr ""
msgid "AdminUsers|(Deactivated)"
msgstr ""
msgid "AdminUsers|(Group Managed Account)"
msgstr ""
msgid "AdminUsers|(Internal)"
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