diff options
author | David Yip <yipdw@member.fsf.org> | 2018-02-09 09:25:53 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-02-09 09:25:53 -0600 |
commit | 020b40efdb2e4ddac14bea81ad60512d51eb7fe5 (patch) | |
tree | b9afe17c1257490af354f76d6e1c1f1b3788e546 /app/models | |
parent | 5ba2c300d8ab0e3adc58a380162b66abafbb3bb8 (diff) | |
parent | 235c14c79d620d47012a08425324df222a136457 (diff) |
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts: .travis.yml app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_detailed_status.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index d495fc390..af54efded 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -84,7 +84,7 @@ class User < ApplicationRecord has_many :session_activations, dependent: :destroy delegate :auto_play_gif, :default_sensitive, :unfollow_modal, :boost_modal, :favourite_modal, :delete_modal, - :reduce_motion, :system_font_ui, :noindex, :flavour, :skin, + :reduce_motion, :system_font_ui, :noindex, :flavour, :skin, :display_sensitive_media, to: :settings, prefix: :setting, allow_nil: false attr_accessor :invite_code |