summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-01-21 14:34:22 -0800
committerGitHub <noreply@github.com>2019-01-21 14:34:22 -0800
commit9cae8fcd68531510512add91fb081602284d5c46 (patch)
treee542834a297f63073f1e20cc335a4670e12c37a7
parente7ae5f53dd23c0fb0be144ff343c886f31fcf528 (diff)
parent3c021ea2643c3ddb0d3e988da1ebf85bad12974c (diff)
downloadchef-9cae8fcd68531510512add91fb081602284d5c46.tar.gz
Merge pull request #8144 from chef/chefstyle_pin
Pin Chefstyle to 0.11.2 in chef-14 branch
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock16
2 files changed, 6 insertions, 12 deletions
diff --git a/Gemfile b/Gemfile
index 91cf837a90..124b631320 100644
--- a/Gemfile
+++ b/Gemfile
@@ -55,7 +55,7 @@ group(:development, :test) do
gem "webmock"
# for testing new chefstyle rules
- gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
+ gem "chefstyle", "=0.11.2"
end
group(:travis) do
diff --git a/Gemfile.lock b/Gemfile.lock
index ce10591d86..2a5c4d3215 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,3 @@
-GIT
- remote: https://github.com/chef/chefstyle.git
- revision: 5190569ae0901e1139f296a92cb448a60d98da56
- branch: master
- specs:
- chefstyle (0.11.1)
- rubocop (= 0.55.0)
-
PATH
remote: .
specs:
@@ -116,6 +108,8 @@ GEM
cheffish (14.0.4)
chef-zero (~> 14.0)
net-ssh
+ chefstyle (0.11.2)
+ rubocop (= 0.55.0)
coderay (1.1.2)
crack (0.4.3)
safe_yaml (~> 1.0.0)
@@ -223,8 +217,8 @@ GEM
plist (~> 3.1)
systemu (~> 2.6.4)
wmi-lite (~> 1.0)
- parallel (1.12.1)
- parser (2.5.3.0)
+ parallel (1.13.0)
+ parser (2.6.0.0)
ast (~> 2.4.0)
parslet (1.8.2)
pastel (0.7.2)
@@ -398,7 +392,7 @@ DEPENDENCIES
chef-config!
chef-vault
cheffish (~> 14)
- chefstyle!
+ chefstyle (= 0.11.2)
inspec-core (~> 3)
netrc
octokit