diff options
| author | Phil Hughes <me@iamphill.com> | 2018-08-28 08:03:08 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-08-28 08:03:08 +0000 |
| commit | a1f1460ae5eafb44c25eeb2fae5102618fafe55f (patch) | |
| tree | 9e792462a3e0b4dd0baf99aed407a40619a28178 | |
| parent | e0984050b31c1d26f6f58f9f2bb113dcf281aaf1 (diff) | |
| parent | 894e9c7f30a5d47eccf48796c7d52109c2af99e3 (diff) | |
| download | gitlab-ce-a1f1460ae5eafb44c25eeb2fae5102618fafe55f.tar.gz | |
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
| -rw-r--r-- | app/views/admin/users/show.html.haml | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/expose-users-id-in-admin-users-show-page.yml | 5 | ||||
| -rw-r--r-- | spec/features/admin/admin_users_spec.rb | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index 029efadd75d..a74e052707f 100644 --- a/app/views/admin/users/show.html.haml +++ b/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: diff --git a/changelogs/unreleased/expose-users-id-in-admin-users-show-page.yml b/changelogs/unreleased/expose-users-id-in-admin-users-show-page.yml new file mode 100644 index 00000000000..0b8ae527214 --- /dev/null +++ b/changelogs/unreleased/expose-users-id-in-admin-users-show-page.yml @@ -0,0 +1,5 @@ +--- +title: Expose user's id in /admin/users/ show page +merge_request: +author: Eva Kadlecova +type: changed diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb index 1db6c75b85b..b2eaeb1c487 100644 --- a/spec/features/admin/admin_users_spec.rb +++ b/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') |