diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-06-06 22:11:14 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-06-06 22:11:14 +0000 |
| commit | 5f0920231f9ac30370968d7501ef66afc0451c61 (patch) | |
| tree | 382c89ea867034dcb097ef393e326dbd106ae607 | |
| parent | c6e26e24f1382392a2eb9cc462316e2646ca6a57 (diff) | |
| parent | 1d81d15787762f8d5b7fa38e0b48201cff268385 (diff) | |
| download | gitlab-ce-5f0920231f9ac30370968d7501ef66afc0451c61.tar.gz | |
Merge branch '47353-delete-user-dropdown' into 'master'
Resolve "Admin area > users dropdown"
Closes #47353
See merge request gitlab-org/gitlab-ce!19505
| -rw-r--r-- | app/views/admin/users/_user.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/admin/users/_user.html.haml b/app/views/admin/users/_user.html.haml index 5e176b61d68..b2163ee85fa 100644 --- a/app/views/admin/users/_user.html.haml +++ b/app/views/admin/users/_user.html.haml @@ -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), |