diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-08-06 13:16:53 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-06 13:16:53 +0200 |
| commit | cad2e6eb7afe96f781175cd829b70a0667d3498a (patch) | |
| tree | 7efda6a7ca7dbe62d6efa42b17c1167e751c44d3 /app/controllers/settings | |
| parent | 3ea7a334d89d2c4075b1dbf649d692ff49325f2e (diff) | |
| parent | 1d8d553d8b5cb23cc67bd530ca9eb70a6683ab2a (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers/settings')
| -rw-r--r-- | app/controllers/settings/preferences_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index ab6b5c0b0..ea4491d1e 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -58,7 +58,7 @@ 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), + 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 |