diff options
| author | Phil Hughes <me@iamphill.com> | 2019-05-20 07:42:55 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-05-20 07:42:55 +0000 |
| commit | 82c4a99cdc1568fda80905b772316b9cde4aa54d (patch) | |
| tree | d383af14c4361eb4d11496bb8b4d99aa585ff15c | |
| parent | a4777d6ea91433a134358de8ca446d96a2e5fd6f (diff) | |
| parent | 3b1a74b12d543224b4e5287fb54046905d006944 (diff) | |
| download | gitlab-ce-82c4a99cdc1568fda80905b772316b9cde4aa54d.tar.gz | |
Merge branch 'admin-users-head-scb' into 'master'
Resolve CE/EE diffs in admin users head
Closes gitlab-ee#10509
See merge request gitlab-org/gitlab-ce!28411
| -rw-r--r-- | app/views/admin/users/_head.html.haml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/admin/users/_head.html.haml b/app/views/admin/users/_head.html.haml index a733f420d11..e7dde7985fd 100644 --- a/app/views/admin/users/_head.html.haml +++ b/app/views/admin/users/_head.html.haml @@ -6,6 +6,7 @@ %span.cred (Internal) - if @user.admin %span.cred (Admin) + = render_if_exists 'admin/users/audtior_user_badge' .float-right - if impersonation_enabled? && @user != current_user && @user.can?(:log_in) |