From d5e585680fb04401150197192de0edaa070cb7b2 Mon Sep 17 00:00:00 2001 From: Gonzalo Rodriguez Date: Wed, 20 Jun 2018 10:29:13 -0300 Subject: [PATCH] Fix CircleCI rubocop runs by excluding vendor/ folder rubocop default configuration exclude vendor/ folder, but in order to get the default we need to merge arrays, given that we are also setting Exclude --- .rubocop.yml | 4 ++++ rack-attack.gemspec | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index 1d679e3..84e396f 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,3 +1,7 @@ +inherit_mode: + merge: + - Exclude + AllCops: TargetRubyVersion: 2.2 DisabledByDefault: true diff --git a/rack-attack.gemspec b/rack-attack.gemspec index f63c35c..233e9ea 100644 --- a/rack-attack.gemspec +++ b/rack-attack.gemspec @@ -38,7 +38,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'rack-test' s.add_development_dependency 'rake' s.add_development_dependency 'redis-activesupport' - s.add_development_dependency "rubocop", "0.55.0" + s.add_development_dependency "rubocop", "0.57.2" s.add_development_dependency "timecop" # Need to explicitly depend on guard because guard-minitest doesn't declare