diff options
| author | Reverite <github@reverite.sh> | 2019-06-01 22:29:46 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-06-01 22:29:46 -0700 |
| commit | 846a09a7435fb9eb435e9950175ee0e696ed4909 (patch) | |
| tree | 9f63c888a5c380d17e1c75ad339a8ca0d689717e /app/controllers/settings/preferences_controller.rb | |
| parent | fdca8d63efe06675ca890358547fcbe7a42631f0 (diff) | |
| parent | 17fb1c4345348da5a6f9338912824a03d348841f (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers/settings/preferences_controller.rb')
| -rw-r--r-- | app/controllers/settings/preferences_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index 3d98d583c..a713ee558 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -46,6 +46,7 @@ class Settings::PreferencesController < Settings::BaseController :setting_hide_followers_count, :setting_aggregate_reblogs, :setting_show_application, + :setting_advanced_layout, :setting_default_content_type, notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account), interactions: %i(must_be_follower must_be_following) |