diff options
| author | Reverite <github@reverite.sh> | 2019-08-08 10:06:09 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-08-08 10:06:09 -0700 |
| commit | 9528d3eda280ffac20a18c6f21bfc51f594e2c86 (patch) | |
| tree | 0b6f5b980996b2d16c2dcdd5b932075812753098 /app/controllers/settings/preferences_controller.rb | |
| parent | 7a312a38f904e853f5703a0b678d0aec83fa858c (diff) | |
| parent | aa485d6f055b93fd7a9df8b47ed96122b38af39e (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers/settings/preferences_controller.rb')
| -rw-r--r-- | app/controllers/settings/preferences_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index ab6b5c0b0..418ea5d7a 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -58,7 +58,8 @@ class Settings::PreferencesController < Settings::BaseController :setting_default_content_type, :setting_use_blurhash, :setting_use_pending_items, - notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account), + :setting_trends, + notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account trending_tag), interactions: %i(must_be_follower must_be_following must_be_following_dm) ) end |