about summary refs log tree commit diff
path: root/app/controllers/settings/preferences_controller.rb
diff options
context:
space:
mode:
authorpluralcafe-docker <git@plural.cafe>2018-12-11 19:07:50 +0000
committerpluralcafe-docker <git@plural.cafe>2018-12-11 19:07:50 +0000
commit68c00c4011d62814b035ff5921822bf0bfb53d64 (patch)
treecf9e0ee2d9d76b779f41c6e7a0d1af689e0045b8 /app/controllers/settings/preferences_controller.rb
parent1c0b2479045015b96907eaa7567bfd14e4593424 (diff)
parentc6b7b984891413cb1db673df2cbea12f8e6f0f05 (diff)
Merge branch 'glitch'
Diffstat (limited to 'app/controllers/settings/preferences_controller.rb')
-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 5c5f31d2b..b70844b65 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -43,6 +43,7 @@ class Settings::PreferencesController < Settings::BaseController
       :setting_system_font_ui,
       :setting_noindex,
       :setting_hide_network,
+      :setting_aggregate_reblogs,
       notification_emails: %i(follow follow_request reblog favourite mention digest report),
       interactions: %i(must_be_follower must_be_following)
     )