about summary refs log tree commit diff
path: root/app/controllers/settings
diff options
context:
space:
mode:
authorAndrew <andrewLchronister@gmail.com>2017-09-19 07:36:23 -0700
committerEugen Rochko <eugen@zeonfederated.com>2017-09-19 16:36:23 +0200
commit0401a24558294b6941c30c922af3f2063dfd305e (patch)
treef40ee4baffd7f567cb11f9a3c162c2e1c4907534 /app/controllers/settings
parent4aea3f88a6d30f102a79c2da7fcfac96465ba1a8 (diff)
Add support for multiple themes (#4959)
* Add support for selecting a theme

* Fix codeclimate issues

* Look up site default style if current user is not available due to e.g. not being logged in

* Remove outdated comment in common.js

* Address requested changes in themes PR

* Fix codeclimate issues

* Explicitly check current_account in application controller and only check theme availability if non-nil

* codeclimate

* explicit precedence with &&

* Fix code style in application_controller according to @nightpool's suggestion, use default style in embedded.html.haml

* codeclimate: indentation + return
Diffstat (limited to 'app/controllers/settings')
-rw-r--r--app/controllers/settings/preferences_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index f107f2b16..207c7b324 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -41,6 +41,7 @@ class Settings::PreferencesController < ApplicationController
       :setting_auto_play_gif,
       :setting_system_font_ui,
       :setting_noindex,
+      :setting_theme,
       notification_emails: %i(follow follow_request reblog favourite mention digest),
       interactions: %i(must_be_follower must_be_following)
     )