Commit 1602ce28 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'admin-user-access-levels-scb' into 'master'

Resolve CE/EE diffs in admin user access levels

Closes gitlab-ee#10507

See merge request gitlab-org/gitlab-ce!28359
parents b5a9295f b0f2d869
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
%p.light %p.light
Regular users have access to their groups and projects Regular users have access to their groups and projects
= render_if_exists 'admin/users/auditor_access_level_radio', f: f, disabled: editing_current_user
= f.radio_button :access_level, :admin, disabled: editing_current_user = f.radio_button :access_level, :admin, disabled: editing_current_user
= label_tag :admin, class: 'font-weight-bold' do = label_tag :admin, class: 'font-weight-bold' do
Admin Admin
......
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