Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Upstream renamed a helper method everywhere. There was one glitch-soc line involving changes because of the local-only post feature. Ported upstream's change.
Style/StringLiterals
ES_CA_CERT
ES_CA_FILE
Style/TrailingCommaInArguments
PremailerWebpackStrategy
PremailerBundledAssetStrategy
simplecov
rails_helper