diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
| commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
| tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /app/helpers/admin | |
| parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) | |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'app/helpers/admin')
| -rw-r--r-- | app/helpers/admin/user_actions_helper.rb | 4 |
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 |