Merge branch '328838-user-admin-provisioned' into 'master'

Show provisioned_by_group_id in user admin

See merge request gitlab-org/gitlab!60315

app/views/admin/users/show.html.haml

@@ -64,6 +64,9 @@
           %span.light= _('External User:')
           %strong
             = @user.external? ? _('Yes') : _('No')
+
+        = render_if_exists 'admin/users/provisioned_by', user: @user
+
         %li
           %span.light= _('Can create groups:')
           %strong

ee/app/views/admin/users/_provisioned_by.html.haml

+- provisioning_group = @user.provisioned_by_group
+- return unless provisioning_group
+%li
+  %span.light
+    = _("Provisioned by:")
+  %strong
+    = link_to provisioning_group.name, admin_group_path(provisioning_group)
+  %span.light
+    = '(%{gid})' % {gid: provisioning_group.id}

ee/changelogs/unreleased/328838-user-admin-provisioned.yml

+---
+title: Add provisioned by group info in user admin
+merge_request: 60315
+author:
+type: added

locale/gitlab.pot

@@ -26155,6 +26155,9 @@ msgstr ""
 msgid "Provider"
 msgstr ""
 
+msgid "Provisioned by:"
+msgstr ""
+
 msgid "Proxy support for this API is not available currently"
 msgstr ""