Commit 82c4a99c 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 gitlab-ee#10509

See merge request gitlab-org/gitlab-ce!28411
parents a4777d6e 3b1a74b1
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
%span.cred (Internal) %span.cred (Internal)
- if @user.admin - if @user.admin
%span.cred (Admin) %span.cred (Admin)
= render_if_exists 'admin/users/audtior_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)
......
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