diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-19 00:06:37 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-19 00:06:37 +0300 |
| commit | 4682f5015a5a2d7eedb66b3c90aee931d3789d0b (patch) | |
| tree | 6240a8a5cf3584a893c6c3351141446e7856dc12 /app/controllers/profiles_controller.rb | |
| parent | 6d59e989185a7d2645792b713d1b5d95d46651fd (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/profiles_controller.rb')
| -rw-r--r-- | app/controllers/profiles_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb index 958a24b6c0e..2b7571e42b7 100644 --- a/app/controllers/profiles_controller.rb +++ b/app/controllers/profiles_controller.rb @@ -100,6 +100,7 @@ class ProfilesController < Profiles::ApplicationController :avatar, :bio, :email, + :role, :hide_no_password, :hide_no_ssh_key, :hide_project_limit, |