Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-05-16 19:57:28 +0300
committerPhil Hughes <me@iamphill.com>2019-05-16 19:57:28 +0300
commit1602ce28c65125f045e36c4420dafd6a7788d37c (patch)
treeef936bba9de44ea63d7aac16c7c9a5d40d828a19 /app/views
parentb5a9295fa99493718bae725a4b45537e98ba979d (diff)
parentb0f2d8690ec1d2d4fb0409010470877c8f8c122f (diff)
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
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin/users/_access_levels.html.haml2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/admin/users/_access_levels.html.haml b/app/views/admin/users/_access_levels.html.haml
index 12e24ddef02..98b6bc7bc46 100644
--- a/app/views/admin/users/_access_levels.html.haml
+++ b/app/views/admin/users/_access_levels.html.haml
@@ -22,6 +22,8 @@
%p.light
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
= label_tag :admin, class: 'font-weight-bold' do
Admin