Claire 2aaf3528ca Merge commit 'd548faf69321260ab4c2a16759ca77773189126a' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/forms.scss`: Conflict because we ran eslint autofix on upstream files. - `config/initializers/content_security_policy.rb`: Code style changes but we have a different version. Kept our version. - `streaming/index.js`: Upstream fixed a typo close to glitch-soc-only code. Applied upstream's changes.		2023-05-08 15:28:36 +02:00
..
development.rb	Refactor monkey-patching of PrivateAddressCheck (#24122)	2023-03-16 04:33:38 +01:00
production.rb	Merge commit 'd548faf69321260ab4c2a16759ca77773189126a' into glitch-soc/merge-upstream	2023-05-08 15:28:36 +02:00
test.rb	Workaround the ActiveRecord / Marshal serialization bug on Ruby 3.2 (#24142)	2023-03-17 14:37:30 +01:00