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

2023-12-21 08:37:12 +09:00 · 2023-12-21 08:37:12 +09:00 · a6b57e3890
commit a6b57e3890
parent 7b8fedb3cd d29b1cca2e
154 changed files with 7762 additions and 1748 deletions
--- a/db/migrate/20230215074423_move_user_settings.rb
+++ b/db/migrate/20230215074423_move_user_settings.rb
@ -86,7 +86,7 @@ class MoveUserSettings < ActiveRecord::Migration[6.1]
          end
        end

-        user.update_column('settings', Oj.dump(user_settings)) # rubocop:disable Rails/SkipsModelValidations
+        user.update_column('settings', Oj.dump(user_settings))
      end
    end
  end