summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2020-12-04 11:48:05 -0800
committerTim Smith <tsmith84@gmail.com>2020-12-04 11:48:05 -0800
commitc4e4540247757a761f8927e02a7de1abee97460f (patch)
tree4f98a3ef3a4dd775764ad9ecdf3d6a656991a3e0 /Gemfile.lock
parent461c17cb04b6a12e338f59aa36b18e78828321af (diff)
downloadchef-c4e4540247757a761f8927e02a7de1abee97460f.tar.gz
Switch back to chefstyle from github
The issue that requires pinning has been resolved Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock20
1 files changed, 13 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index c8e7bd2d2a..f93e4a06d6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,4 +1,12 @@
GIT
+ remote: https://github.com/chef/chefstyle.git
+ revision: 4beb76511e5e3e414bb88942c75f107eb56a9aa1
+ branch: master
+ specs:
+ chefstyle (1.5.7)
+ rubocop (= 1.5.2)
+
+GIT
remote: https://github.com/chef/ohai.git
revision: 876839a6324a635f15db4118366c938bdd3d675b
branch: master
@@ -158,8 +166,6 @@ GEM
cheffish (16.0.12)
chef-zero (>= 14.0)
net-ssh
- chefstyle (1.5.2)
- rubocop (= 1.3.1)
coderay (1.1.3)
concurrent-ruby (1.1.7)
crack (0.4.4)
@@ -188,7 +194,7 @@ GEM
ffi (>= 1.0.1)
gyoku (1.3.1)
builder (>= 2.1.2)
- hana (1.3.6)
+ hana (1.3.7)
hashdiff (1.0.1)
hashie (3.6.0)
highline (2.0.3)
@@ -307,13 +313,13 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.10.0)
rspec-support (3.10.0)
- rubocop (1.3.1)
+ rubocop (1.5.2)
parallel (~> 1.10)
parser (>= 2.7.1.5)
rainbow (>= 2.2.2, < 4.0)
- regexp_parser (>= 1.8)
+ regexp_parser (>= 1.8, < 3.0)
rexml
- rubocop-ast (>= 1.1.1)
+ rubocop-ast (>= 1.2.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 2.0)
rubocop-ast (1.3.0)
@@ -428,7 +434,7 @@ DEPENDENCIES
chef-utils!
chef-vault
cheffish (>= 14)
- chefstyle (= 1.5.2)
+ chefstyle!
fauxhai-ng
inspec-core-bin (~> 4.23)
ohai!