Merge #2655 "Ignore schema.rb in RuboCop"

2020-06-26 20:19:34 -07:00 · 2020-06-26 20:19:34 -07:00 · 668aa388a1
commit 668aa388a1
parent 042fe17fdb 17c0abb2de
2 changed files with 6 additions and 1 deletions
--- a/.rubocop.yml
+++ b/.rubocop.yml
@ -2,10 +2,16 @@ require: rubocop-rspec

 inherit_from: .rubocop_todo.yml

+inherit_mode:
+  merge:
+    - Exclude
+
 AllCops:
  UseCache: true
  CacheRootDirectory: tmp/rubocop_cache_rails_dir
  MaxFilesInCache: 4000
+  Exclude:
+    - db/schema.rb

 #################### Style ###########################

--- 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'