Commit 69170188 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'admin-users-head-scb' into 'master'

Resolve CE/EE diffs in admin users head

Closes #10509

See merge request gitlab-org/gitlab-ee!12851
parents c15a0e14 a7f8c5ee
...@@ -6,8 +6,7 @@ ...@@ -6,8 +6,7 @@
%span.cred (Internal) %span.cred (Internal)
- if @user.admin - if @user.admin
%span.cred (Admin) %span.cred (Admin)
- if @user.auditor = render_if_exists 'admin/users/audtior_user_badge'
%span.cred (Auditor)
.float-right .float-right
- if impersonation_enabled? && @user != current_user && @user.can?(:log_in) - if impersonation_enabled? && @user != current_user && @user.can?(:log_in)
......
- if @user.auditor
%span.cred (Auditor)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment