diff options
| author | Surinna Curtis <ekiru.0@gmail.com> | 2017-11-16 01:38:26 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-16 01:38:26 -0600 |
| commit | ee560abdbe7a2caf0f7ac6137faf248bbaff9a93 (patch) | |
| tree | fcd9bdb5ba49ab7a6a79590c74db858ae77b4239 /app/controllers/settings | |
| parent | 88627fd7aa2493a6890d60a5965459e4c7fe6fe9 (diff) | |
| parent | 35fbdc36f92b610e8a73e2acb220e87cf5fc83b0 (diff) | |
Merge pull request #216 from glitch-soc/merge-upstream-3023725
Merge upstream at commit 3023725
Diffstat (limited to 'app/controllers/settings')
| -rw-r--r-- | app/controllers/settings/notifications_controller.rb | 2 |
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 |