diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-09-12 18:31:54 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-09-12 18:31:54 +0000 |
| commit | e21c12375a1c636f58b1630c6906f702dbd56830 (patch) | |
| tree | de205413552c00e8b028fd610eada33df607b758 /app/controllers | |
| parent | c9e11a884ebe6db94ab997058281bb1ab829f612 (diff) | |
| parent | 9b177bb7c94df6c7d3868235f75939a41acf8718 (diff) | |
| download | gitlab-ce-e21c12375a1c636f58b1630c6906f702dbd56830.tar.gz | |
Merge branch 'revert-2f46c3a8' into 'master'
Revert "Merge branch 'revert-f2421b2b' into 'master'"
See merge request !14190
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 |