diff options
| author | Starfall <us@starfall.systems> | 2022-04-26 10:41:24 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2022-04-26 10:41:24 -0500 |
| commit | fd98fd86128a5cea302b8496b6c7d5464ec1958a (patch) | |
| tree | f3e304a32bed75cb8ab6b1f38652192bff71c5f1 /app/models/user.rb | |
| parent | 8da73d2e57284c765b232bfc6842a7ac0f0a702b (diff) | |
| parent | a481af15a9b2a7829c2a849906aa4b475ccdbd98 (diff) | |
Merge remote-tracking branch 'glitch/main'
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 5dd93519c..5c1f9504a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -130,7 +130,7 @@ class User < ApplicationRecord :reduce_motion, :system_font_ui, :noindex, :flavour, :skin, :display_media, :hide_followers_count, :expand_spoilers, :default_language, :aggregate_reblogs, :show_application, :advanced_layout, :use_blurhash, :use_pending_items, :trends, :crop_images, - :disable_swiping, :default_content_type, :system_emoji_font, + :disable_swiping, :always_send_emails, :default_content_type, :system_emoji_font, to: :settings, prefix: :setting, allow_nil: false attr_reader :invite_code |