f5b7307890
Conflicts: - `.rubocop_todo.yml`: Took upstream's version of the conflicting lines. |
||
|---|---|---|
| .. | ||
| active_record | ||
| assets | ||
| chewy | ||
| devise/strategies | ||
| generators/post_deployment_migration | ||
| linter | ||
| mastodon | ||
| paperclip | ||
| rails | ||
| redis | ||
| sanitize_ext | ||
| simple_navigation | ||
| tasks | ||
| templates/haml/scaffold | ||
| terrapin | ||
| webpacker | ||
| exceptions.rb | ||
| http_extensions.rb | ||
| premailer_webpack_strategy.rb | ||
| public_file_server_middleware.rb | ||