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
migration_warning.rb
rack_middleware.rb
redis_config.rb	Enable Rails 7.1 Marshalling format (#28609)	2024-01-05 21:57:47 +00:00
sidekiq_middleware.rb
snowflake.rb
version.rb