diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-08-07 13:56:48 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-07 13:56:48 +0200 |
commit | 04534604c654060eca24628247fdb51b7ff5372a (patch) | |
tree | f8ae222e84056fb2674d23187e66517da1fc2af9 /app/models/user.rb | |
parent | 8400ddca7155005ab79485ed6054c04ea3ca5667 (diff) | |
parent | ac33f1aedd9a6c72c6c176afb1f5d62a1ce5d44d (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/views/admin/dashboard/index.html.haml - config/locales/simple_form.en.yml
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 |