Commit 5f092023 authored by Clement Ho's avatar Clement Ho

Merge branch '47353-delete-user-dropdown' into 'master'

Resolve "Admin area > users dropdown"

Closes #47353

See merge request gitlab-org/gitlab-ce!19505
parents c6e26e24 1d81d157
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
%li.divider %li.divider
- if user.can_be_removed? - if user.can_be_removed?
%li %li
%button.delete-user-button.btn.btn-danger{ data: { toggle: 'modal', %button.delete-user-button.btn.text-danger{ data: { toggle: 'modal',
target: '#delete-user-modal', target: '#delete-user-modal',
delete_user_url: admin_user_path(user), delete_user_url: admin_user_path(user),
block_user_url: block_admin_user_path(user), block_user_url: block_admin_user_path(user),
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
= s_('AdminUsers|Delete user') = s_('AdminUsers|Delete user')
%li %li
%button.delete-user-button.btn.btn-danger{ data: { toggle: 'modal', %button.delete-user-button.btn.text-danger{ data: { toggle: 'modal',
target: '#delete-user-modal', target: '#delete-user-modal',
delete_user_url: admin_user_path(user, hard_delete: true), delete_user_url: admin_user_path(user, hard_delete: true),
block_user_url: block_admin_user_path(user), block_user_url: block_admin_user_path(user),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment