Claire 0b2c7cdb02 Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/content_security_policy.rb`: Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS` environment variable. Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.		2024-01-10 17:51:12 +01:00
..
cli	Use heredoc on federation CLI warning strings (#28578)	2024-01-04 09:21:27 +00:00
migration_helpers.rb	Capture minimum postgres version 12 (#27528)	2023-10-26 20:35:15 +00:00
migration_warning.rb	Migration warning helper, and only run in production env (#24253)	2023-03-26 00:39:24 +01:00
rack_middleware.rb	Fix opening and closing Redis connections instead of using a pool (#18171)	2022-04-29 22:43:07 +02:00
redis_config.rb	Enable Rails 7.1 Marshalling format (#28609)	2024-01-05 21:57:47 +00:00
sidekiq_middleware.rb	Do not truncate backtrace when the `BACKTRACE` env variable is set (#26794)	2023-09-06 09:18:10 +02:00
snowflake.rb	Fix `Style/SelfAssignment` cop (#28171)	2023-12-01 15:52:52 +00:00
version.rb	Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream	2023-10-08 16:30:00 +02:00