diff options
| author | ThibG <thib@sitedethib.com> | 2019-08-07 20:04:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-07 20:04:22 +0200 |
| commit | 86cfa2ea6cb94c9597b9fcda034c8b4d959c5e3e (patch) | |
| tree | 2e1b3be0201e53c96f05993f1295b0e97bb14166 /app/models/user.rb | |
| parent | 8400ddca7155005ab79485ed6054c04ea3ca5667 (diff) | |
| parent | e8ad0a800616a1f95fd71ab8457869e716212ca0 (diff) | |
Merge pull request #1193 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 67cf92307..45a4b8989 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -107,7 +107,9 @@ 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, :use_pending_items, :use_pending_items, to: :settings, prefix: :setting, allow_nil: false + :advanced_layout, :use_blurhash, :use_pending_items, :trends, + :default_content_type, + to: :settings, prefix: :setting, allow_nil: false attr_reader :invite_code attr_writer :external |