diff options
author | ThibG <thib@sitedethib.com> | 2019-08-06 17:25:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-06 17:25:54 +0200 |
commit | 8400ddca7155005ab79485ed6054c04ea3ca5667 (patch) | |
tree | 696f5ae9a70891e96fdf819905b05aa6482bcf07 /app/controllers/settings | |
parent | 3ea7a334d89d2c4075b1dbf649d692ff49325f2e (diff) | |
parent | d10f6036cfeebec5b2c160db8659d2c19d29fe9c (diff) |
Merge pull request #1191 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 |