From d3b18eede636c1d0523cdc517a87710ab4a87a81 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sat, 13 Feb 2021 06:08:56 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- app/views/admin/users/_head.html.haml | 4 +--- changelogs/unreleased/321447-fix-foss.yml | 5 +++++ locale/gitlab.pot | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 changelogs/unreleased/321447-fix-foss.yml 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) diff --git a/changelogs/unreleased/321447-fix-foss.yml b/changelogs/unreleased/321447-fix-foss.yml new file mode 100644 index 00000000000..9cff6ebec6a --- /dev/null +++ b/changelogs/unreleased/321447-fix-foss.yml @@ -0,0 +1,5 @@ +--- +title: Move GMA user badging in admin to EE only +merge_request: 54125 +author: +type: fixed diff --git a/locale/gitlab.pot b/locale/gitlab.pot index e323e339ead..9398036fc11 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -988,6 +988,9 @@ msgstr "" msgid "(+%{count} rules)" msgstr "" +msgid "(Group Managed Account)" +msgstr "" + msgid "(No changes)" msgstr "" @@ -2253,9 +2256,6 @@ msgstr "" msgid "AdminUsers|(Deactivated)" msgstr "" -msgid "AdminUsers|(Group Managed Account)" -msgstr "" - msgid "AdminUsers|(Internal)" msgstr ""