Claire 9765d2b3f8 Merge branch 'main' into glitch-soc/merge-upstream ...

Conflicts:
- `config/environments/production.rb`:
  Upstream changed headers, and we have different ones.
  Ported upstream's change.

2023-01-10 09:39:15 +01:00

..

development.rb

Fix warnings on Rails boot (#16946)

2021-12-27 00:47:20 +01:00

production.rb

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

2023-01-10 09:39:15 +01:00

test.rb

Fix Sidekiq warnings about JSON serialization (#17381)

2022-01-28 00:43:56 +01:00