diff options
| author | Reverite <github@reverite.sh> | 2019-06-27 21:10:01 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-06-27 21:10:01 -0700 |
| commit | 9861df046853b71370cede86afbba1a371714756 (patch) | |
| tree | 38416f38dfc2a2349b7a5df20646bb7d0f51361f /app/controllers/settings | |
| parent | 2d396aa3a0bf2674194b9f4c0e0a1052b8d23a06 (diff) | |
| parent | ca17bae904783dfb1f4899a533d28a79da0c6fe9 (diff) | |
Merge branch 'glitch' into production
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 5103cc50e..451742d41 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -52,6 +52,7 @@ class Settings::PreferencesController < Settings::BaseController :setting_show_application, :setting_advanced_layout, :setting_default_content_type, + :setting_use_blurhash, notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account), interactions: %i(must_be_follower must_be_following must_be_following_dm) ) |