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

Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes.
2022-11-28 11:33:34 +01:00
parent 6517b7b9f0 cec1e902e0
commit a2e7997592
246 changed files with 17637 additions and 6738 deletions
--- a/lib/mastodon/redis_config.rb
+++ b/lib/mastodon/redis_config.rb
@@ -37,6 +37,7 @@ REDIS_CACHE_PARAMS = {
  namespace: cache_namespace,
  pool_size: Sidekiq.server? ? Sidekiq.options[:concurrency] : Integer(ENV['MAX_THREADS'] || 5),
  pool_timeout: 5,
+  connect_timeout: 5,
 }.freeze

 REDIS_SIDEKIQ_PARAMS = {