diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-08-28 13:27:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-28 13:27:17 +0200 |
| commit | 215738bb3cba4951e84174b461da5f1004b0649e (patch) | |
| tree | ceca848b6a0553474e2b228dbf8c9e9c144cc99f /app/controllers/settings | |
| parent | 54d9a9c18a74a1ec766d8f611ad3ee11ab4c5422 (diff) | |
| parent | 54ae7a221e862990550850500d70997c70187b70 (diff) | |
Merge pull request #1833 from ClearlyClaire/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 669ed00c6..4c1336436 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_trends, :setting_crop_images, :setting_always_send_emails, - notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account trending_tag trending_link trending_status appeal), + notification_emails: %i(follow follow_request reblog favourite mention report pending_account trending_tag trending_link trending_status appeal), interactions: %i(must_be_follower must_be_following must_be_following_dm) ) end |