diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-26 15:38:44 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-26 15:38:44 +0000 |
| commit | cf129d6f34c098f5e1b248bd52bb5db72aecfd13 (patch) | |
| tree | dbeec19871a23a9d51f2e1794aca1ed97f5010b1 /app/controllers/admin/users_controller.rb | |
| parent | 4ef836923a85d470508f3bdd6b4f30cac2333086 (diff) | |
| parent | 98f4665eaf8d352988467217b6b91732e9f8cced (diff) | |
| download | gitlab-ce-cf129d6f34c098f5e1b248bd52bb5db72aecfd13.tar.gz | |
Merge branch '6-6-3-patch' into '6-6-stable'
6.6.3 Patch
Fixes 500 error when try to edit own user via admin area
Diffstat (limited to 'app/controllers/admin/users_controller.rb')
| -rw-r--r-- | app/controllers/admin/users_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index bdbb9a354b4..5b06af79d5a 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -68,7 +68,9 @@ class Admin::UsersController < Admin::ApplicationController params[:user].delete(:password_confirmation) end - user.admin = (admin && admin.to_i > 0) + if admin.present? + user.admin = !admin.to_i.zero? + end respond_to do |format| if user.update_attributes(params[:user], as: :admin) |