diff options
author | Tim Smith <tsmith@chef.io> | 2020-11-05 11:58:57 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-05 11:58:57 -0800 |
commit | 0e6ba9771da5a0e0bc4acb7dcb5ac34738664289 (patch) | |
tree | 8dd3e6ce9e925ac1a33f1dfd545ba3a50d24fc12 | |
parent | 4f725b7ea36413c81df1919bae1d9ea51c1e807a (diff) | |
parent | a71a65a25b51b52fbb4e2ab4607e584d52cc3b61 (diff) | |
download | chef-0e6ba9771da5a0e0bc4acb7dcb5ac34738664289.tar.gz |
Merge pull request #10603 from chef/bump_rubocop
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r-- | .rubocop.yml | 2 | ||||
-rw-r--r-- | Gemfile.lock | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 0c874566be..0270949244 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -32,7 +32,7 @@ Lint/ShadowedException: Enabled: false # set additional paths -ChefRuby/UnlessDefinedRequire: +Chef/Ruby/UnlessDefinedRequire: Include: - 'lib/**/*' - 'chef-bin/**/*' diff --git a/Gemfile.lock b/Gemfile.lock index 07a4fd9efd..3e30100169 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,10 @@ GIT remote: https://github.com/chef/chefstyle.git - revision: 5a9d289050658ef6af34977f4f41eeb7ffaa2991 + revision: 3abb236bf92acf81ddb91786f5eb39e7b7221274 branch: master specs: - chefstyle (1.4.5) - rubocop (= 0.93.1) + chefstyle (1.5.0) + rubocop (= 1.2.0) GIT remote: https://github.com/chef/ohai.git @@ -313,13 +313,13 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) rspec-support (3.10.0) - rubocop (0.93.1) + rubocop (1.2.0) parallel (~> 1.10) parser (>= 2.7.1.5) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8) rexml - rubocop-ast (>= 0.6.0) + rubocop-ast (>= 1.0.1) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) rubocop-ast (1.1.1) |