Commit 8135412c authored by Andrew Fontaine's avatar Andrew Fontaine

Merge branch '301100-gma-badge' into 'master'

Add GMA badge in user admin

See merge request gitlab-org/gitlab!54027
parents 5594f221 1f9785b9
...@@ -6,6 +6,9 @@ ...@@ -6,6 +6,9 @@
- elsif @user.blocked? - elsif @user.blocked?
%span.cred %span.cred
= s_('AdminUsers|(Blocked)') = s_('AdminUsers|(Blocked)')
- if @user.group_managed_account?
%span.cred
= s_('AdminUsers|(Group Managed Account)')
- if @user.internal? - if @user.internal?
%span.cred %span.cred
= s_('AdminUsers|(Internal)') = s_('AdminUsers|(Internal)')
......
---
title: Add indicator in admin dashboard if user is group managed
merge_request: 54027
author:
type: added
...@@ -2253,6 +2253,9 @@ msgstr "" ...@@ -2253,6 +2253,9 @@ msgstr ""
msgid "AdminUsers|(Deactivated)" msgid "AdminUsers|(Deactivated)"
msgstr "" msgstr ""
msgid "AdminUsers|(Group Managed Account)"
msgstr ""
msgid "AdminUsers|(Internal)" msgid "AdminUsers|(Internal)"
msgstr "" msgstr ""
......
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