about summary refs log tree commit diff
path: root/app/controllers/settings
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-07-17 16:56:10 +0200
committerGitHub <noreply@github.com>2019-07-17 16:56:10 +0200
commite9cc17bbeab1f1d47b5a919adb0ae7eae4eee791 (patch)
tree21f25d570ea6f57d58c24eec6e65aab8b96f816b /app/controllers/settings
parent5ccd011cc3bafc00a557dabbb47da004f3d4a381 (diff)
parente91bf82083ac390a0cf229d8e94fa412fdec57ff (diff)
Merge pull request #1164 from ThibG/glitch-soc/cherry-pick-upstream
Cherry-pick changes from upstream
Diffstat (limited to 'app/controllers/settings')
-rw-r--r--app/controllers/settings/preferences_controller.rb1
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)
     )