Commit d29f0f96 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 #10507

See merge request gitlab-org/gitlab-ee!12781
parents 04e7ebde 38d81a60
......@@ -22,12 +22,7 @@
%p.light
Regular users have access to their groups and projects
- if license_allows_auditor_user?
= f.radio_button :access_level, :auditor, disabled: editing_current_user
= label_tag :auditor, class: 'font-weight-bold' do
Auditor
%p.light
Auditors have read-only access to all groups, projects and users
= 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
= label_tag :admin, class: 'font-weight-bold' do
......
- disabled = params.fetch(:disabled, false)
- if license_allows_auditor_user?
= f.radio_button :access_level, :auditor, disabled: disabled
= label_tag :auditor, class: 'font-weight-bold' do
Auditor
%p.light
Auditors have read-only access to all groups, projects and users
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