about summary refs log tree commit diff
path: root/app/models/form
diff options
context:
space:
mode:
authorJakub Mendyk <jakubmendyk.szkola+git@gmail.com>2018-08-23 14:17:35 +0200
committerEugen Rochko <eugen@zeonfederated.com>2018-08-23 14:17:35 +0200
commit6cb3514d64ec24b164484f4eb84363b96746d5d6 (patch)
tree7de47dff8b187bb5921e7b7a331a9ef487a1cae5 /app/models/form
parentd1c2c917d9685879d9c5cd203e416a8ef796f1e1 (diff)
Add ability to change an instance default theme from the administration panel (#7092) (#8381)
* Add default_settings class method to ScopedSettings

ScopedSettings was extended to use value of unscoped setting instead of
only using defaults set in config/settings.yml for selected settings.
This adds possibility for admins to set default values of users' settings,
for example default theme (as requested in #7092).

* Add ability to change an instance default theme

Closes #7092
Diffstat (limited to 'app/models/form')
-rw-r--r--app/models/form/admin_settings.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb
index 010cf7fc3..db46cda7b 100644
--- a/app/models/form/admin_settings.rb
+++ b/app/models/form/admin_settings.rb
@@ -30,6 +30,8 @@ class Form::AdminSettings
     :show_staff_badge=,
     :bootstrap_timeline_accounts,
     :bootstrap_timeline_accounts=,
+    :theme,
+    :theme=,
     :min_invite_role,
     :min_invite_role=,
     :activity_api_enabled,