diff options
| author | Reverite <github@reverite.sh> | 2019-04-12 01:38:18 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-04-12 01:38:18 -0700 |
| commit | e10a9794f4ed7c90e3190f285359f55dd00da435 (patch) | |
| tree | 579ebf95d6bbf091d05e66907a9c8168c926e0af /app/controllers/settings/preferences_controller.rb | |
| parent | ff736905fa534f7189e57c1d0c14fbac45f239a1 (diff) | |
| parent | bb50ec2e6687238ad8b2ec545a73270fee7a7b09 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers/settings/preferences_controller.rb')
| -rw-r--r-- | app/controllers/settings/preferences_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index 241053261..eb7a0eb4a 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -46,7 +46,7 @@ class Settings::PreferencesController < Settings::BaseController :setting_hide_followers_count, :setting_aggregate_reblogs, :setting_show_application, - notification_emails: %i(follow follow_request reblog favourite mention digest report), + notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account), interactions: %i(must_be_follower must_be_following) ) end |