summaryrefslogtreecommitdiff
path: root/app/views/admin
diff options
context:
space:
mode:
authorhttp://jneen.net/ <jneen@jneen.net>2017-03-09 14:06:05 -0800
committerhttp://jneen.net/ <jneen@jneen.net>2017-03-09 14:06:05 -0800
commit00cf529a8dfb87dfdb0cc489a69c0043c646b345 (patch)
treed8c227d9f046673f56538e8e014c1c920d5feb26 /app/views/admin
parent90d924dc390693892a596659aa1a38b0432f6e40 (diff)
downloadgitlab-ce-00cf529a8dfb87dfdb0cc489a69c0043c646b345.tar.gz
mark internal users in the admin panel
and don't offer to impersonate them
Diffstat (limited to 'app/views/admin')
-rw-r--r--app/views/admin/users/_head.html.haml4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/admin/users/_head.html.haml b/app/views/admin/users/_head.html.haml
index d20be373564..be41c33b853 100644
--- a/app/views/admin/users/_head.html.haml
+++ b/app/views/admin/users/_head.html.haml
@@ -2,11 +2,13 @@
= @user.name
- if @user.blocked?
%span.cred (Blocked)
+ - if @user.internal?
+ %span.cred (Internal)
- if @user.admin
%span.cred (Admin)
.pull-right
- - unless @user == current_user || @user.blocked?
+ - if @user != current_user && @user.can?(:log_in)
= link_to 'Impersonate', impersonate_admin_user_path(@user), method: :post, class: "btn btn-nr btn-grouped btn-info"
= link_to edit_admin_user_path(@user), class: "btn btn-nr btn-grouped" do
%i.fa.fa-pencil-square-o