diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-09-07 15:56:00 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-09-07 15:56:00 +0000 |
| commit | f2421b2b97d81ef7631f1baefb4ba4401c8a04dc (patch) | |
| tree | 4cc7610789043fb53458490929c619261f43e9c4 /app/controllers | |
| parent | 780dd6c6af0fe73026c88ef06fc277901bbef573 (diff) | |
| parent | 26264625cbc2692bc113c1e701cb15eecbd010d2 (diff) | |
| download | gitlab-ce-f2421b2b97d81ef7631f1baefb4ba4401c8a04dc.tar.gz | |
Merge branch '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'
Add option to change navigation color palette
Closes #35012
See merge request !13619
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 a99563b7100..635298bc24a 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 |