diff options
| author | ThibG <thib@sitedethib.com> | 2018-05-18 17:20:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-18 17:20:32 +0200 |
| commit | 625c4f36ef394215e65e19157bfaf60e7de94b5f (patch) | |
| tree | 72560d046b60c8478d10f26c212a70870e50eb2d /app/controllers/settings | |
| parent | 023dfa119ed43fe35188e560c24cd3091c14ad0b (diff) | |
| parent | 765fc6700cefcf326e8e4104f7f82ac5ed9b9bea (diff) | |
Merge pull request #490 from glitch-soc/merge-upstream
Merge with tootsuite @ 57b503d4ef0754e4651eae26b628cba60e1ab4e9
Diffstat (limited to 'app/controllers/settings')
| -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) ) |