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
test
default_scope
Admin::ActionLog
rubocop:disable
AdminMailer
MediaAttachment
RSpec/MetadataStyle
Sidekiq::Testing.fake!
enable_coverage_for_eval