diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-02 11:18:50 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-02 11:18:50 +0000 |
| commit | 68112433e1c5537538004f6279cfe83d38aaaa0b (patch) | |
| tree | 932d6b749e6d76c85327635bc5e3355558e8bc62 | |
| parent | 063ad5250dbc749bce66d6183d19cbbf27baaec1 (diff) | |
| parent | 05e98306e4dfbba289de3585ef24507541bbd484 (diff) | |
| download | gitlab-ce-68112433e1c5537538004f6279cfe83d38aaaa0b.tar.gz | |
Merge branch '33207-show-delete-option-in-admin-users-page' into 'master'
Allow admins to delete users from the admin users page
Closes #33207
See merge request !11852
| -rw-r--r-- | app/views/admin/users/_user.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/33207-show-delete-option-in-admin-users-page.yml | 4 | ||||
| -rw-r--r-- | spec/features/admin/admin_users_spec.rb | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/app/views/admin/users/_user.html.haml b/app/views/admin/users/_user.html.haml index 8862455688f..46d2e3b3de1 100644 --- a/app/views/admin/users/_user.html.haml +++ b/app/views/admin/users/_user.html.haml @@ -34,7 +34,7 @@ - if user.access_locked? %li = link_to 'Unlock', unlock_admin_user_path(user), method: :put, class: 'btn-grouped btn btn-xs btn-success', data: { confirm: 'Are you sure?' } - - if user.can_be_removed? && can?(current_user, :destroy_user, @user) + - if user.can_be_removed? && can?(current_user, :destroy_user, user) %li.divider %li = link_to 'Delete user', [:admin, user], data: { confirm: "USER #{user.name} WILL BE REMOVED! All issues, merge requests and groups linked to this user will also be removed! Consider cancelling this deletion and blocking the user instead. Are you sure?" }, diff --git a/changelogs/unreleased/33207-show-delete-option-in-admin-users-page.yml b/changelogs/unreleased/33207-show-delete-option-in-admin-users-page.yml new file mode 100644 index 00000000000..5eb4e15e311 --- /dev/null +++ b/changelogs/unreleased/33207-show-delete-option-in-admin-users-page.yml @@ -0,0 +1,4 @@ +--- +title: Allow admins to delete users from the admin users page +merge_request: 11852 +author: diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb index 12cf59f42b0..376e80571d0 100644 --- a/spec/features/admin/admin_users_spec.rb +++ b/spec/features/admin/admin_users_spec.rb @@ -21,6 +21,8 @@ describe "Admin::Users", feature: true do expect(page).to have_content(current_user.name) expect(page).to have_content(user.email) expect(page).to have_content(user.name) + expect(page).to have_link('Block', href: block_admin_user_path(user)) + expect(page).to have_link('Delete', href: admin_user_path(user)) end describe 'Two-factor Authentication filters' do |