diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-02-07 04:10:13 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-02-07 04:10:13 +0000 |
| commit | 50f5960c72b4ff8b553bb0f7e8f649ac413f6ce0 (patch) | |
| tree | 3fce35b12e29a10b538ce030ad7d661d332ba3e0 /app/controllers/admin | |
| parent | 437b46b9a18b1eb26c0caecf0ff6863d8ad9faa7 (diff) | |
| parent | f5a798c7434bf236f36b399347c49fa3edf1f04e (diff) | |
| download | gitlab-ce-50f5960c72b4ff8b553bb0f7e8f649ac413f6ce0.tar.gz | |
Merge branch 'ee-1439-read-only-user' into 'master'
Backport changes from gitlab-org/gitlab-ee!998
See merge request !8984
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/users_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index aa0f8d434dc..1cd50852e89 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -175,7 +175,7 @@ class Admin::UsersController < Admin::ApplicationController def user_params_ce [ - :admin, + :access_level, :avatar, :bio, :can_create_group, |