Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2017-06-01 18:18:21 +0300
committerNick Thomas <nick@gitlab.com>2017-06-01 18:30:06 +0300
commit05e98306e4dfbba289de3585ef24507541bbd484 (patch)
tree2a2c9344b8ebc73a5d483b17d786d748137dea8f /app/views/admin
parentf07aee72bef4604312e11a43fce3a47865bce100 (diff)
Allow admins to delete users from the admin users page
Diffstat (limited to 'app/views/admin')
-rw-r--r--app/views/admin/users/_user.html.haml2
1 files changed, 1 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?" },