tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	README.md

Discarded upstream changes to the README, kept our version.
This commit is contained in:
Thibaut Girka
2018-09-03 14:33:06 +02:00
parent e915bc3e9e ccc2f608c5
commit 6c233a04a0
67 changed files with 1726 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/settings/notifications_controller.rb
View File

@@ -21,7 +21,7 @@ class Settings::NotificationsController < Settings::BaseController
def user_settings_params
params.require(:user).permit(
notification_emails: %i(follow follow_request reblog favourite mention digest),
notification_emails: %i(follow follow_request reblog favourite mention digest report),
interactions: %i(must_be_follower must_be_following must_be_following_dm)
)
end

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

@@ -42,7 +42,7 @@ class Settings::PreferencesController < Settings::BaseController
:setting_system_font_ui,
:setting_noindex,
:setting_hide_network,
notification_emails: %i(follow follow_request reblog favourite mention digest),
notification_emails: %i(follow follow_request reblog favourite mention digest report),
interactions: %i(must_be_follower must_be_following)
)
end