From 2e3cbf7d89815e2915f77677388c49b48f8d20c3 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 12 Dec 2019 00:07:43 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 lib/api/users.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/api')

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)
-- 
cgit v1.2.1