Conflicts: - `config/initializers/content_security_policy.rb`: Upstream reworked the CSP, we kept our version for now. - `spec/requests/content_security_policy_spec.rb`: Upstream reworked the CSP, we kept our version for now.
RSpec/SpecFilePathFormat
Perfomance/UnfreezeString
img-src
media-src
https:
Rails/RedundantActiveRecordAllMethod
Style/SlicingWithRange
inLanguage
/deck
PlainTextFormatter
account_id
max_id
min_id
StatusCacheHydrator
frame_rate
ffprobe