diff options
| author | Reverite <github@reverite.sh> | 2019-05-21 20:48:57 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-05-21 20:48:57 -0700 |
| commit | d873e4f3d5878a2b2800758cbe3b9c870c228d51 (patch) | |
| tree | 23a3a373699381d4bd4f629136b9c82de5df96a3 /app/controllers/settings | |
| parent | 4cea89bf2e9ce7f73fccfc637191b1e039ad25ee (diff) | |
| parent | 2332b3f146b0d879daba8a99bd35c8bf425edea3 (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 eb7a0eb4a..3d98d583c 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -46,6 +46,7 @@ class Settings::PreferencesController < Settings::BaseController :setting_hide_followers_count, :setting_aggregate_reblogs, :setting_show_application, + :setting_default_content_type, notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account), interactions: %i(must_be_follower must_be_following) ) |