Merge branch 'add_namespace_id_to_users_in_admin_area' into 'master'

Add namespace id to users page in admin area

See merge request gitlab-org/gitlab!41877

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

@@ -44,6 +44,10 @@
           %span.light ID:
           %strong
             = @user.id
+        %li
+          %span.light= _('Namespace ID:')
+          %strong
+            = @user.namespace_id
 
         %li.two-factor-status
           %span.light Two-factor Authentication:

changelogs/unreleased/add_namespace_id_to_users_in_admin_area.yml

+---
+title: Add namespace ID to user pages in the admin area
+merge_request: 41877
+author:
+type: added

locale/gitlab.pot

@@ -16382,6 +16382,9 @@ msgstr ""
 msgid "Namespace"
 msgstr ""
 
+msgid "Namespace ID:"
+msgstr ""
+
 msgid "Namespace is empty"
 msgstr ""
 

spec/features/admin/admin_users_spec.rb

@@ -279,7 +279,8 @@ RSpec.describe "Admin::Users" do
 
       expect(page).to have_content(user.email)
       expect(page).to have_content(user.name)
-      expect(page).to have_content(user.id)
+      expect(page).to have_content("ID: #{user.id}")
+      expect(page).to have_content("Namespace ID: #{user.namespace_id}")
       expect(page).to have_button('Deactivate user')
       expect(page).to have_button('Block user')
       expect(page).to have_button('Delete user')