diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-05-26 15:41:40 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-05-26 15:41:40 +0200 |
| commit | 20d01a954e0961eed41954bd23713e91a1dafe14 (patch) | |
| tree | a7a8ba480fabe4f669755ef4c0b78e213b1ea2ac /app/models | |
| parent | fdb3952b203d562ba32ba3131d941fa4ea07d7b3 (diff) | |
| parent | 63483ee543eb6c81e2cf6450a682cdb657e92751 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”.
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 |