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

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

app/models/user_settings.rb

@@ -59,6 +59,7 @@ class UserSettings
     setting :use_custom_css, default: false
     setting :content_font_size, default: 'medium', in: %w(medium large x_large xx_large)
     setting :bookmark_category_needed, default: false
+    setting :use_system_scrollbars, default: false
     setting :disable_swiping, default: false
     setting :disable_hover_cards, default: false
     setting :delete_modal, default: true