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
44a7a272
Commit
44a7a272
authored
Jan 31, 2021
by
Simon Knox
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'arty-fix-auditor-badge' into 'master'
Fix auditor badging See merge request gitlab-org/gitlab!52943
parents
bf68a923
6a16fe5f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
app/views/admin/users/_head.html.haml
app/views/admin/users/_head.html.haml
+1
-1
changelogs/unreleased/arty-fix-auditor-badge.yml
changelogs/unreleased/arty-fix-auditor-badge.yml
+5
-0
No files found.
app/views/admin/users/_head.html.haml
View file @
44a7a272
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
-
if
@user
.
deactivated?
-
if
@user
.
deactivated?
%span
.cred
%span
.cred
=
s_
(
'AdminUsers|(Deactivated)'
)
=
s_
(
'AdminUsers|(Deactivated)'
)
=
render_if_exists
'admin/users/aud
ti
or_user_badge'
=
render_if_exists
'admin/users/aud
it
or_user_badge'
.float-right
.float-right
-
if
impersonation_enabled?
&&
@user
!=
current_user
&&
@user
.
can?
(
:log_in
)
-
if
impersonation_enabled?
&&
@user
!=
current_user
&&
@user
.
can?
(
:log_in
)
...
...
changelogs/unreleased/arty-fix-auditor-badge.yml
0 → 100644
View file @
44a7a272
---
title
:
Fix to show auditor badging in admin user view
merge_request
:
52943
author
:
type
:
fixed
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