diff options
| author | reverite <samantha@chalker.io> | 2019-01-29 21:13:22 -0800 |
|---|---|---|
| committer | reverite <samantha@chalker.io> | 2019-01-29 21:13:22 -0800 |
| commit | 3510128c51f615634350a93dfb19053519d65454 (patch) | |
| tree | 85bac2a16c9c2371679d43311d9d6b069c988e94 /app/controllers | |
| parent | c5b97d18762dce34a95ca42e9335e672c66953c0 (diff) | |
| parent | c2ccdad102cae9bc3dc94d1d6c6f306ca0366370 (diff) | |
Merge branch 'master' into production
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/settings/preferences_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index d4932afd6..241053261 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -45,6 +45,7 @@ class Settings::PreferencesController < Settings::BaseController :setting_hide_network, :setting_hide_followers_count, :setting_aggregate_reblogs, + :setting_show_application, notification_emails: %i(follow follow_request reblog favourite mention digest report), interactions: %i(must_be_follower must_be_following) ) |