diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-11 15:44:42 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-11 15:44:42 +0000 |
| commit | 9b177bb7c94df6c7d3868235f75939a41acf8718 (patch) | |
| tree | ef8541d3ef8047f2ac6711b6e030244f812b7b49 /app/controllers | |
| parent | 73a913f2b5f2a5dd36e13e09d74264d1da218d6a (diff) | |
| download | gitlab-ce-9b177bb7c94df6c7d3868235f75939a41acf8718.tar.gz | |
Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8
This reverts merge request !14148
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/users_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/profiles/preferences_controller.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 9ec7719fabb..cbcef70e957 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -211,6 +211,7 @@ class Admin::UsersController < Admin::ApplicationController :provider, :remember_me, :skype, + :theme_id, :twitter, :username, :website_url diff --git a/app/controllers/profiles/preferences_controller.rb b/app/controllers/profiles/preferences_controller.rb index 1e557c47638..cce2a847b53 100644 --- a/app/controllers/profiles/preferences_controller.rb +++ b/app/controllers/profiles/preferences_controller.rb @@ -35,7 +35,8 @@ class Profiles::PreferencesController < Profiles::ApplicationController :color_scheme_id, :layout, :dashboard, - :project_view + :project_view, + :theme_id ) end end |