diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-04-08 22:24:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-08 22:24:07 +0200 |
| commit | c483101b4ae7d9f22ea43921c512f479e16e98ca (patch) | |
| tree | 1de88394686dd7f532e7ddf68a9023caa1bfdb88 /app/controllers/settings/preferences_controller.rb | |
| parent | e0c39f9fad837b77373220515f078f2443ddf553 (diff) | |
| parent | a8d89aabb2292af499f2d1392ad435dd261dd41b (diff) | |
Merge pull request #1737 from ClearlyClaire/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 | 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 |