Add latest changes from gitlab-org/gitlab@master

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)

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

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 ""