summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-11-19 04:12:31 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-11-19 04:12:31 -0800
commit4eef112462e4a9d7d990603896810d0e945e1769 (patch)
treeea009a66540a8b535af256e03b1cca3b1fe7e4c6 /app
parentc403c2a8e11e473035e0f4c4fe476efc8130fa89 (diff)
parent19e8473eb7dd456b64315b1b9e62c780ace98fef (diff)
downloadgitlab-ce-4eef112462e4a9d7d990603896810d0e945e1769.tar.gz
Merge pull request #1906 from dosire/user_cannot_be_removed_if_project_owner
Cannot remove user that owns a project.
Diffstat (limited to 'app')
-rw-r--r--app/controllers/admin/users_controller.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index c9586ad5da9..744b1912a6c 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -98,6 +98,9 @@ class Admin::UsersController < AdminController
def destroy
@admin_user = User.find(params[:id])
+ if @admin_user.my_own_projects.count > 0
+ redirect_to admin_users_path, alert: "User is a project owner and can't be removed." and return
+ end
@admin_user.destroy
respond_to do |format|