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

Conflicts:
- `README.md`:
  We have completely different contents. Kept our version.
- `package.json`:
  Not a real conflict, just an upstream dependency udpated
  textually too close to a glitch-soc-only dependency.
  Updated dependencies like upstream.
- `streaming/index.js`:
  Conflict due to code style changes on parts that were
  modified in glitch-soc to handle local-only toots.
  Changed style according to upstream.
This commit is contained in:
Claire
2021-12-27 15:16:18 +01:00
14 changed files with 909 additions and 962 deletions

View File

@@ -1,5 +1,7 @@
# frozen_string_literal: true
require_relative '../../lib/sidekiq_error_handler'
Sidekiq.configure_server do |config|
config.redis = REDIS_SIDEKIQ_PARAMS