diff options
| author | ThibG <thib@sitedethib.com> | 2018-12-09 16:38:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-09 16:38:09 +0100 |
| commit | c6b7b984891413cb1db673df2cbea12f8e6f0f05 (patch) | |
| tree | 46e3982da219f7a5ac34c3aecaf32f0990578d1d /app/controllers/settings/preferences_controller.rb | |
| parent | e3682c9c1750e5e7e5d2f817e29f6760a18400ca (diff) | |
| parent | 4f59d1efd786c08cc63e0c14dceada80c37ab8da (diff) | |
Merge pull request #849 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 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) ) |