Merge remote-tracking branch 'origin/kb_development' into kb_migration

2023-04-07 21:45:07 +09:00 · 2023-04-07 21:45:07 +09:00 · 3d53a47905
commit 3d53a47905
parent 4c975d32a1 8719715e27
20 changed files with 63 additions and 16 deletions
--- a/app/models/concerns/has_user_settings.rb
+++ b/app/models/concerns/has_user_settings.rb
@ -59,6 +59,10 @@ module HasUserSettings
    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