diff options
| author | Spencer Alves <impiaaa@gmail.com> | 2018-05-31 21:33:16 -0700 |
|---|---|---|
| committer | Spencer Alves <impiaaa@gmail.com> | 2018-05-31 21:33:16 -0700 |
| commit | 7d2e6429c27c5ddc8ef3d2366c44329092e07f77 (patch) | |
| tree | 7cfd2035f69616a369b2f3762ce9cefe61c2bd22 /app/controllers/settings/preferences_controller.rb | |
| parent | f2ff167c1a8df9b2521d33fcca15b8d5c67c50b1 (diff) | |
| parent | e396fbfe3bf4d2a404e78e73cff1a609dd0a9bfb (diff) | |
Merge branch 'glitch' into thread-icon
Diffstat (limited to 'app/controllers/settings/preferences_controller.rb')
| -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 c853b5ab7..425664d49 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -40,6 +40,7 @@ class Settings::PreferencesController < Settings::BaseController :setting_reduce_motion, :setting_system_font_ui, :setting_noindex, + :setting_hide_network, notification_emails: %i(follow follow_request reblog favourite mention digest), interactions: %i(must_be_follower must_be_following) ) |