diff options
| author | ThibG <thib@sitedethib.com> | 2019-07-17 16:56:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-17 16:56:10 +0200 |
| commit | e9cc17bbeab1f1d47b5a919adb0ae7eae4eee791 (patch) | |
| tree | 21f25d570ea6f57d58c24eec6e65aab8b96f816b /app/models | |
| parent | 5ccd011cc3bafc00a557dabbb47da004f3d4a381 (diff) | |
| parent | e91bf82083ac390a0cf229d8e94fa412fdec57ff (diff) | |
Merge pull request #1164 from ThibG/glitch-soc/cherry-pick-upstream
Cherry-pick changes from upstream
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 9bc3dd608..bb903a45c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -106,7 +106,7 @@ class User < ApplicationRecord delegate :auto_play_gif, :default_sensitive, :unfollow_modal, :boost_modal, :favourite_modal, :delete_modal, :reduce_motion, :system_font_ui, :noindex, :flavour, :skin, :display_media, :hide_network, :hide_followers_count, :expand_spoilers, :default_language, :aggregate_reblogs, :show_application, - :advanced_layout, :default_content_type, :use_blurhash, to: :settings, prefix: :setting, allow_nil: false + :advanced_layout, :default_content_type, :use_blurhash, :use_pending_items, to: :settings, prefix: :setting, allow_nil: false attr_reader :invite_code attr_writer :external |