diff options
| author | Reverite <github@reverite.sh> | 2019-06-01 22:29:46 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-06-01 22:29:46 -0700 |
| commit | 846a09a7435fb9eb435e9950175ee0e696ed4909 (patch) | |
| tree | 9f63c888a5c380d17e1c75ad339a8ca0d689717e /app/models | |
| parent | fdca8d63efe06675ca890358547fcbe7a42631f0 (diff) | |
| parent | 17fb1c4345348da5a6f9338912824a03d348841f (diff) | |
Merge branch 'glitch' into production
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 |