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`.
RSpec/SpecFilePathFormat
test
models/form/custom_emoji_batch
Capybara/ClickLinkOrButtonStyle
CLI::Emoji
AdminMailer
RSpec/MetadataStyle
RSpec/LetSetup
enable_coverage_for_eval