Merge branch 'Expose-users-id-in-admin-users-show-page' into 'master'

Expose user's id in /admin/users/ show page.

See merge request gitlab-org/gitlab-ce!21297

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

@@ -39,6 +39,10 @@
             %strong= email.email
             = link_to remove_email_admin_user_path(@user, email), data: { confirm: "Are you sure you want to remove #{email.email}?" }, method: :delete, class: "btn-sm btn btn-remove float-right", title: 'Remove secondary email', id: "remove_email_#{email.id}" do
               %i.fa.fa-times
+        %li
+          %span.light ID:
+          %strong
+            = @user.id
         %li.two-factor-status
           %span.light Two-factor Authentication:

changelogs/unreleased/expose-users-id-in-admin-users-show-page.yml

+---
+title: Expose user's id in /admin/users/ show page
+merge_request:
+author: Eva Kadlecova
+type: changed

spec/features/admin/admin_users_spec.rb

@@ -134,6 +134,7 @@ 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_link('Block user', href: block_admin_user_path(user))
       expect(page).to have_button('Delete user')
       expect(page).to have_button('Delete user and contributions')