Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse source
This commit is contained in:
Thibaut Girka 2019-08-06 13:16:53 +02:00
commit cad2e6eb7a
39 changed files with 384 additions and 296 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/settings/preferences_controller.rb
View file

@ -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