Commit 2c502524 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #6025 from jvanbaarsen/fix-for-admin-user-edit

Fix for edit user as admin
parents d88aafcb 34c8ca28
...@@ -56,8 +56,12 @@ ...@@ -56,8 +56,12 @@
.form-group .form-group
= f.label :admin, class: 'control-label' = f.label :admin, class: 'control-label'
.col-sm-10= f.check_box :admin - if current_user == @user
- unless @user.new_record? .col-sm-10= f.check_box :admin, disabled: true
.col-sm-10 You cannot remove your own admin rights
- else
.col-sm-10= f.check_box :admin
- unless @user.new_record? || current_user == @user
.alert.alert-danger .alert.alert-danger
- if @user.blocked? - if @user.blocked?
%p This user is blocked and is not able to login to GitLab %p This user is blocked and is not able to login to GitLab
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment