From c593d6df9cecabed5becf4e16c3d3b2e3de99d76 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 2 Sep 2018 00:11:58 +0200 Subject: Add preference for report notification e-mails, skip for duplicates (#8559) If an unresolved report for the same target account already exists, no new notification is generated --- app/controllers/settings/preferences_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers') diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index e2cb13167..b475c722d 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -46,7 +46,7 @@ class Settings::PreferencesController < ApplicationController :setting_noindex, :setting_theme, :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 -- cgit From 075e162319754b9ab3bebfaae3f4e8b975f29d98 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sun, 2 Sep 2018 02:05:32 +0200 Subject: Whitelist report notification param in Settings::NotificationsController (#8560) Bug in #8559 --- app/controllers/settings/notifications_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers') diff --git a/app/controllers/settings/notifications_controller.rb b/app/controllers/settings/notifications_controller.rb index ce2530c54..fe45c17b2 100644 --- a/app/controllers/settings/notifications_controller.rb +++ b/app/controllers/settings/notifications_controller.rb @@ -25,7 +25,7 @@ class Settings::NotificationsController < ApplicationController 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 -- cgit