Merge branch 'main' into glitch-soc/merge-upstream

2023-04-03 17:40:59 +02:00
parent 8192b0da7c 77bd32a26a
commit 4d5b4dacd6
159 changed files with 3636 additions and 1965 deletions
--- a/lib/mastodon/redis_config.rb
+++ b/lib/mastodon/redis_config.rb
@@ -35,7 +35,7 @@ REDIS_CACHE_PARAMS = {
  url: ENV['CACHE_REDIS_URL'],
  expires_in: 10.minutes,
  namespace: cache_namespace,
-  pool_size: Sidekiq.server? ? Sidekiq.options[:concurrency] : Integer(ENV['MAX_THREADS'] || 5),
+  pool_size: Sidekiq.server? ? Sidekiq[:concurrency] : Integer(ENV['MAX_THREADS'] || 5),
  pool_timeout: 5,
  connect_timeout: 5,
 }.freeze