diff options
| author | ThibG <thib@sitedethib.com> | 2019-06-27 16:43:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-27 16:43:55 +0200 |
| commit | 2f95adc06fbfae22e8f9b4df212938108f5e295c (patch) | |
| tree | 13ff1b5ae743f3d147eb58dfa4a790ef1a7c049d /app/models/user.rb | |
| parent | 9ef25877dfda12cf31ec586294e4d4908f5be4f0 (diff) | |
| parent | 6ab7051b48dcb1d45c377a129350db1fdeaf11b8 (diff) | |
Merge pull request #1142 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/user.rb')
| -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 f6936cb9d..9bc3dd608 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -106,7 +106,7 @@ 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, to: :settings, prefix: :setting, allow_nil: false + :advanced_layout, :default_content_type, :use_blurhash, to: :settings, prefix: :setting, allow_nil: false attr_reader :invite_code attr_writer :external |