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.
admin_mailer
UnnecessaryStringOutput
ENV.fetch
InstanceVariables
#error_explanation
Rubocop
Perfomance/UnfreezeString