diff options
| author | ThibG <thib@sitedethib.com> | 2019-05-27 21:26:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-27 21:26:03 +0200 |
| commit | 1b0ce85e3da4b5c1941f65da7d73258da6eed6d0 (patch) | |
| tree | 4ee42aa7195fd98de901dd73947e4eda2f195015 /app/models | |
| parent | fdb3952b203d562ba32ba3131d941fa4ea07d7b3 (diff) | |
| parent | 6d60701bfaa3a4b2bc168ea413c8f0c8e1545526 (diff) | |
Merge pull request #1072 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/user.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 496cb0b1b..c24741ff1 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -104,7 +104,8 @@ 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, :default_content_type, to: :settings, prefix: :setting, allow_nil: false + :expand_spoilers, :default_language, :aggregate_reblogs, :show_application, + :advanced_layout, :default_content_type, to: :settings, prefix: :setting, allow_nil: false attr_reader :invite_code attr_writer :external |