gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'parent/main' into upstream-20240716

Browse source
This commit is contained in:
KMY 2024-07-16 09:01:12 +09:00
commit adee1645a3
203 changed files with 1707 additions and 1067 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/models/concerns/user/has_settings.rb
View file

@ -175,10 +175,6 @@ module User::HasSettings
settings['web.display_media']
end
def setting_display_media_expand
settings['web.display_media_expand']
end
def setting_expand_spoilers
settings['web.expand_content_warnings']
end
@ -215,6 +211,10 @@ module User::HasSettings
settings['web.disable_swiping']
end
def setting_disable_hover_cards
settings['web.disable_hover_cards']
end
def setting_always_send_emails
settings['always_send_emails']
end