about summary refs log tree commit diff
path: root/app/controllers/settings/notifications_controller.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-11-14 21:12:57 +0100
committerGitHub <noreply@github.com>2017-11-14 21:12:57 +0100
commitfbef909c2a1ff8d24811f76237e62fbef6cc63cc (patch)
tree935c852c30ee793ce881a719ae367d49e4a8684a /app/controllers/settings/notifications_controller.rb
parentc3ec1e87b8c19487c954b0cc571b426b4d5b53fa (diff)
Add option to block direct messages from people you don't follow (#5669)
* Add option to block direct messages from people you don't follow

Fix #5326

* If the DM responds to a toot by recipient, allow it through

* i18n: Update Polish translation (for #5669) (#5673)
Diffstat (limited to 'app/controllers/settings/notifications_controller.rb')
-rw-r--r--app/controllers/settings/notifications_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/settings/notifications_controller.rb b/app/controllers/settings/notifications_controller.rb
index 09839f16e..ce2530c54 100644
--- a/app/controllers/settings/notifications_controller.rb
+++ b/app/controllers/settings/notifications_controller.rb
@@ -26,7 +26,7 @@ class Settings::NotificationsController < ApplicationController
   def user_settings_params
     params.require(:user).permit(
       notification_emails: %i(follow follow_request reblog favourite mention digest),
-      interactions: %i(must_be_follower must_be_following)
+      interactions: %i(must_be_follower must_be_following must_be_following_dm)
     )
   end
 end