From 162e0f720f9a440fe0efc0e395791257f1298f54 Mon Sep 17 00:00:00 2001 From: Andrew Kvalheim Date: Fri, 3 Apr 2020 16:32:03 -0700 Subject: [PATCH 1/2] Exclude Rails database schema from linting The schema is automatically generated, so RuboCop's recommendations are non-actionable; ignore it as in rubocop-hq/rubocop#752. --- .rubocop.yml | 2 ++ .rubocop_todo.yml | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index 23ceccc8..e56339ca 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -6,6 +6,8 @@ AllCops: UseCache: true CacheRootDirectory: tmp/rubocop_cache_rails_dir MaxFilesInCache: 4000 + Exclude: + - db/schema.rb #################### Style ########################### diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index c968a091..22d7366f 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1155,7 +1155,6 @@ Style/StringLiterals: - 'config/deploy.rb' - 'config/environments/production.rb' - 'config/puma.rb' - - 'db/schema.rb' - 'lib/tasks/dump_db.rake' - 'lib/tasks/events_registrations.rake' - 'lib/tasks/factory_bot.rake' From 75d28b802fbafea80c1bbfe05a1e9d95c981cd78 Mon Sep 17 00:00:00 2001 From: Andrew Kvalheim Date: Fri, 3 Apr 2020 17:06:36 -0700 Subject: [PATCH 2/2] Don't clobber RuboCop's default excludes By default, adding an exclude (faffc49) has the effect of removing the default excludes. Merge them as described in rubocop-hq/rubocop#6567. --- .rubocop.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.rubocop.yml b/.rubocop.yml index e56339ca..bdb72694 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -2,6 +2,10 @@ require: rubocop-rspec inherit_from: .rubocop_todo.yml +inherit_mode: + merge: + - Exclude + AllCops: UseCache: true CacheRootDirectory: tmp/rubocop_cache_rails_dir