summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@chef.io>2020-03-03 11:27:06 -0800
committerGitHub <noreply@github.com>2020-03-03 11:27:06 -0800
commit633c4445e00f3174d156ac69a05be117a3fd0456 (patch)
tree2c4ee10c49a5571edb94d4fb1fae63c0a6f5462a
parent518a69d8b6f146edff19dfab1a77d88def71c77e (diff)
parent2d7a6e6cc225310bfd31357b48ce1a6d0fc831a9 (diff)
downloadchef-633c4445e00f3174d156ac69a05be117a3fd0456.tar.gz
Merge pull request #9437 from chef/lcg/rubocop-bump
Rename cop in the .rubocop.yml for new chefstyle
-rw-r--r--.rubocop.yml2
-rw-r--r--Gemfile.lock12
2 files changed, 8 insertions, 6 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 9730861155..9780173555 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -19,7 +19,7 @@ Lint/AssignmentInCondition:
Enabled: false
Lint/AmbiguousBlockAssociation:
Enabled: false
-Lint/UnneededSplatExpansion:
+Lint/RedundantSplatExpansion:
Enabled: false
Lint/ShadowingOuterLocalVariable:
Enabled: false
diff --git a/Gemfile.lock b/Gemfile.lock
index f88575c0d7..04eb439ef3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
GIT
remote: https://github.com/chef/chefstyle.git
- revision: 1100200f616fe080048fa49fa5942754904c32ca
+ revision: 32c232ae6e52834108bb736928e2ba3dd09d6df0
branch: master
specs:
- chefstyle (0.14.2)
- rubocop (= 0.75.1)
+ chefstyle (0.15.0)
+ rubocop (= 0.80.1)
GIT
remote: https://github.com/chef/ohai.git
@@ -312,6 +312,7 @@ GEM
rake (12.3.2)
rb-readline (0.5.5)
regexp_parser (1.7.0)
+ rexml (3.2.4)
rspec (3.9.0)
rspec-core (~> 3.9.0)
rspec-expectations (~> 3.9.0)
@@ -331,11 +332,12 @@ GEM
rspec_junit_formatter (0.2.3)
builder (< 4)
rspec-core (>= 2, < 4, != 2.12.0)
- rubocop (0.75.1)
+ rubocop (0.80.1)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
- parser (>= 2.6)
+ parser (>= 2.7.0.1)
rainbow (>= 2.2.2, < 4.0)
+ rexml
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.7)
ruby-prof (1.2.0)