diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-26 21:15:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-26 21:15:19 +0100 |
| commit | 551820cbd9e5beebd16f16205143e2263d4f2d51 (patch) | |
| tree | 6868722efeb660c0031a22aecfdc4b2c5bc9dcc6 /app/controllers/settings/preferences_controller.rb | |
| parent | e48eaf64cc7cb0cfab388331c4823ee5fb580d59 (diff) | |
| parent | 67c6f37e269a4ebb538e019351f894183f3c1439 (diff) | |
Merge pull request #1704 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 | 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 d05ceb53f..dfe2ae2e5 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_use_pending_items, :setting_trends, :setting_crop_images, - notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account trending_tag), + notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account trending_tag trending_link trending_status), interactions: %i(must_be_follower must_be_following must_be_following_dm) ) end |