diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-04-08 22:24:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-08 22:24:07 +0200 |
| commit | c483101b4ae7d9f22ea43921c512f479e16e98ca (patch) | |
| tree | 1de88394686dd7f532e7ddf68a9023caa1bfdb88 /app/models/user.rb | |
| parent | e0c39f9fad837b77373220515f078f2443ddf553 (diff) | |
| parent | a8d89aabb2292af499f2d1392ad435dd261dd41b (diff) | |
Merge pull request #1737 from ClearlyClaire/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 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 |