Merge remote-tracking branch 'parent/main' into kb-upstream-20231026

2023-10-26 20:24:34 +09:00 · 2023-10-26 20:24:34 +09:00 · 5448bcf276
commit 5448bcf276
parent 551a9e8216 49b8433c56
313 changed files with 3717 additions and 4735 deletions
--- a/app/models/concerns/has_user_settings.rb
+++ b/app/models/concerns/has_user_settings.rb
@ -4,7 +4,7 @@ module HasUserSettings
  extend ActiveSupport::Concern

  included do
-    serialize :settings, UserSettingsSerializer
+    serialize :settings, coder: UserSettingsSerializer
  end

  def settings_attributes=(attributes)