diff options
author | Starfall <us@starfall.systems> | 2022-04-26 10:41:24 -0500 |
---|---|---|
committer | Starfall <us@starfall.systems> | 2022-04-26 10:41:24 -0500 |
commit | fd98fd86128a5cea302b8496b6c7d5464ec1958a (patch) | |
tree | f3e304a32bed75cb8ab6b1f38652192bff71c5f1 /app/controllers/settings | |
parent | 8da73d2e57284c765b232bfc6842a7ac0f0a702b (diff) | |
parent | a481af15a9b2a7829c2a849906aa4b475ccdbd98 (diff) |
Merge remote-tracking branch 'glitch/main'
Diffstat (limited to 'app/controllers/settings')
-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 1fddd087b..669ed00c6 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -57,7 +57,8 @@ class Settings::PreferencesController < Settings::BaseController :setting_use_pending_items, :setting_trends, :setting_crop_images, - notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account trending_tag trending_link trending_status), + :setting_always_send_emails, + notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account trending_tag trending_link trending_status appeal), interactions: %i(must_be_follower must_be_following must_be_following_dm) ) end |