diff options
| author | Reverite <github@reverite.sh> | 2019-07-20 18:46:40 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-07-20 18:46:40 -0700 |
| commit | 266540080ef5659060faa7da502123f45bbc04f2 (patch) | |
| tree | 1c34751dd4e199737b7a2a4c511b756760941c52 /app/controllers/settings/preferences_controller.rb | |
| parent | 40fd56351f0a466e0e3785cca4ee27f2a9060e8a (diff) | |
| parent | f1597e1ab90b1fb291f16977877c6ca79bf89676 (diff) | |
Merge branch 'glitch' into production
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 451742d41..372f253cb 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -53,6 +53,7 @@ class Settings::PreferencesController < Settings::BaseController :setting_advanced_layout, :setting_default_content_type, :setting_use_blurhash, + :setting_use_pending_items, 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) ) |