diff options
| author | Valeriy Sizov <vsv2711@gmail.com> | 2012-10-08 05:42:47 -0700 |
|---|---|---|
| committer | Valeriy Sizov <vsv2711@gmail.com> | 2012-10-08 05:42:47 -0700 |
| commit | fc3c0592db4cf6f6139a995ebd0b5078937945ab (patch) | |
| tree | ba051b25707d8f7cd2fad7b3c1273d3c7dc3e3da | |
| parent | a9cce9358ae2c264bad1fc61c6e1d20b9e3a23c7 (diff) | |
| parent | 927d0cc2674d21f470a29e7a10577707172f13c6 (diff) | |
| download | gitlab-ce-fc3c0592db4cf6f6139a995ebd0b5078937945ab.tar.gz | |
Merge pull request #1651 from dosire/user_can_be_removed_if_its_not_a_project_owner
Do not allow removal of a project owner user.
| -rw-r--r-- | app/controllers/admin/users_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index c9586ad5da9..55f2b24894f 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -98,6 +98,7 @@ class Admin::UsersController < AdminController def destroy @admin_user = User.find(params[:id]) + redirect_to admin_users_url, notice: 'User is a project owner, cannot be removed.' and return if @admin_user.my_own_projects.count > 0 @admin_user.destroy respond_to do |format| |