diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-05 15:08:56 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-05 15:08:56 +0000 |
commit | 61265b9f01c7db3d4f6e1266d165b1c85be7b9e7 (patch) | |
tree | b6589df984e18e3b008a155c8d9ffcae75cf7c91 /app/services/users/destroy_service.rb | |
parent | 5460c19548d3d3d2ff764ceff05c2b72aa2d3a32 (diff) | |
download | gitlab-ce-61265b9f01c7db3d4f6e1266d165b1c85be7b9e7.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/users/destroy_service.rb')
-rw-r--r-- | app/services/users/destroy_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/users/destroy_service.rb b/app/services/users/destroy_service.rb index 436d4fb3985..613d2e4ad82 100644 --- a/app/services/users/destroy_service.rb +++ b/app/services/users/destroy_service.rb @@ -26,7 +26,7 @@ module Users def execute(user, options = {}) delete_solo_owned_groups = options.fetch(:delete_solo_owned_groups, options[:hard_delete]) - unless Ability.allowed?(current_user, :destroy_user, user) + unless Ability.allowed?(current_user, :destroy_user, user) || options[:skip_authorization] raise Gitlab::Access::AccessDeniedError, "#{current_user} tried to destroy user #{user}!" end |