kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Resolve "Admin area > users dropdown"

Closes #47353

See merge request gitlab-org/gitlab-ce!19505
This commit is contained in:
Clement Ho 2018-06-06 22:11:14 +00:00
parent c6e26e24f1 1d81d15787
commit 5f0920231f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/admin/users/_user.html.haml
View File

@ -38,7 +38,7 @@
%li.divider
- if user.can_be_removed?
%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',
delete_user_url: admin_user_path(user),
block_user_url: block_admin_user_path(user),
@ -47,7 +47,7 @@
= s_('AdminUsers|Delete user')
%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',
delete_user_url: admin_user_path(user, hard_delete: true),
block_user_url: block_admin_user_path(user),