diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-13 09:08:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-13 09:08:56 +0300 |
| commit | d3b18eede636c1d0523cdc517a87710ab4a87a81 (patch) | |
| tree | 055a36733c8f61f6ca4b65b5ec07e4d3bfc7e3b2 /app | |
| parent | cec66a35795c484018b16ee1e17ecd1c7cb3a9c8 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/admin/users/_head.html.haml | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/views/admin/users/_head.html.haml b/app/views/admin/users/_head.html.haml index 2f26fbdf1e1..8a4a1a54c58 100644 --- a/app/views/admin/users/_head.html.haml +++ b/app/views/admin/users/_head.html.haml @@ -6,9 +6,6 @@ - elsif @user.blocked? %span.cred = s_('AdminUsers|(Blocked)') - - if @user.group_managed_account? - %span.cred - = s_('AdminUsers|(Group Managed Account)') - if @user.internal? %span.cred = s_('AdminUsers|(Internal)') @@ -19,6 +16,7 @@ %span.cred = s_('AdminUsers|(Deactivated)') = render_if_exists 'admin/users/auditor_user_badge' + = render_if_exists 'admin/users/gma_user_badge' .float-right - if impersonation_enabled? && @user != current_user && @user.can?(:log_in) |