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
Style/RedundantReturn
Perfomance/UnfreezeString
Rails/RedundantActiveRecordAllMethod
Style/SlicingWithRange
inLanguage
/deck
PlainTextFormatter
account_id
max_id
min_id
StatusCacheHydrator
frame_rate
ffprobe