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:
Diffstat (limited to 'app/helpers/admin/user_actions_helper.rb')
-rw-r--r--app/helpers/admin/user_actions_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/admin/user_actions_helper.rb b/app/helpers/admin/user_actions_helper.rb
index 5719d8f5ffd..dc31c06477e 100644
--- a/app/helpers/admin/user_actions_helper.rb
+++ b/app/helpers/admin/user_actions_helper.rb
@@ -48,9 +48,9 @@ module Admin
end
def delete_actions
- return unless can?(current_user, :destroy_user, @user) && !@user.blocked_pending_approval? && @user.can_be_removed?
+ return unless can?(current_user, :destroy_user, @user) && !@user.blocked_pending_approval?
- @actions << 'delete'
+ @actions << 'delete' if @user.can_be_removed?
@actions << 'delete_with_contributions'
end