From 75d28b802fbafea80c1bbfe05a1e9d95c981cd78 Mon Sep 17 00:00:00 2001 From: Andrew Kvalheim Date: Fri, 3 Apr 2020 17:06:36 -0700 Subject: [PATCH] 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