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`.
Sidekiq::Testing.fake!
models/form/custom_emoji_batch
RSpec/LetSetup
spec/models
models/announcement
CustomFilter
Naming/VariableNumber
RSpec/MessageSpies
RSpec/MetadataStyle
default_scope
Admin::ActionLog
RSpec/MessageChain
RSpec/AnyInstance
.times
StatusPin
PIN_LIMIT
Lint/EmptyBlock
Lint/UselessAssignment
normalizes
Webhook#events