diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-12 00:07:43 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-12 00:07:43 +0000 |
| commit | 2e3cbf7d89815e2915f77677388c49b48f8d20c3 (patch) | |
| tree | 03bdbc99e829295e8077b2ec4032300c15b48e37 /lib/api/users.rb | |
| parent | e44bb86539a8fb4cfb06dfe281632b6f206bd0a7 (diff) | |
| download | gitlab-ce-2e3cbf7d89815e2915f77677388c49b48f8d20c3.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/users.rb')
| -rw-r--r-- | lib/api/users.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb index ff0b1e87b03..3b54d95504f 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -452,6 +452,7 @@ module API user = User.find_by(id: params[:id]) not_found!('User') unless user + conflict!('User cannot be removed while is the sole-owner of a group') unless user.can_be_removed? || params[:hard_delete] destroy_conditionally!(user) do user.delete_async(deleted_by: current_user, params: params) |