Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Upstream added `<s>` to the list of allowed tags, the conflict is because we have a different list of allowed tags. Added `<s>` like upstream did.
SECRET_KEY_BASE_DUMMY
Style/StringLiterals
ES_CA_CERT
ES_CA_FILE
read:me
profile
:email
Style/NilLambda
PremailerWebpackStrategy
PremailerBundledAssetStrategy
match_type
simplecov
rails_helper
bundle exec rails
rake