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

2024-09-06 08:42:24 +09:00 · 2024-09-06 08:42:24 +09:00 · f18eabfe75
commit f18eabfe75
parent 71671b09ef 7efe0bde9d
689 changed files with 4369 additions and 2434 deletions
--- a/spec/services/resolve_account_service_spec.rb
+++ b/spec/services/resolve_account_service_spec.rb
@ -232,7 +232,7 @@ RSpec.describe ResolveAccountService do
      rescue ActiveRecord::RecordNotUnique
        fail_occurred = true
      ensure
-        RedisConfiguration.pool.checkin if Thread.current[:redis]
+        RedisConnection.pool.checkin if Thread.current[:redis]
      end
    end