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

2024-12-04 11:56:14 +09:00 · 2024-12-04 11:56:14 +09:00 · 0a0b0d46ea
commit 0a0b0d46ea
parent 6f074e88a7 30c2a6c01c
52 changed files with 599 additions and 451 deletions
--- a/app/models/concerns/user/has_settings.rb
+++ b/app/models/concerns/user/has_settings.rb
@ -131,6 +131,10 @@ module User::HasSettings
    settings['reject_send_limited_to_suspects']
  end

+  def setting_system_scrollbars_ui
+    settings['web.use_system_scrollbars']
+  end
+
  def setting_noindex
    settings['noindex']
  end