summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock12
-rw-r--r--omnibus/Gemfile.lock2
3 files changed, 11 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 5ffb94ad68..7eec6c7434 100644
--- a/Gemfile
+++ b/Gemfile
@@ -52,7 +52,7 @@ group(:development, :test) do
gem "webmock"
# for testing new chefstyle rules
- gem "chefstyle"
+ gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
end
group(:travis) do
diff --git a/Gemfile.lock b/Gemfile.lock
index 6677329c96..ad15a3eb58 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,11 @@
+GIT
+ remote: https://github.com/chef/chefstyle.git
+ revision: 5e596babac0e107170ce7c5cc706646bf609ab25
+ branch: master
+ specs:
+ chefstyle (0.11.0)
+ rubocop (= 0.55.0)
+
PATH
remote: .
specs:
@@ -108,8 +116,6 @@ GEM
cheffish (14.0.1)
chef-zero (~> 14.0)
net-ssh
- chefstyle (0.11.0)
- rubocop (= 0.55.0)
coderay (1.1.2)
crack (0.4.3)
safe_yaml (~> 1.0.0)
@@ -355,7 +361,7 @@ DEPENDENCIES
chef-config!
chef-vault
cheffish (~> 14)
- chefstyle
+ chefstyle!
inspec-core (~> 2)
netrc
octokit
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index c812ec5944..620c5bb3d4 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: ec8df13fa165b7d3866ee61fc05f060283adc642
+ revision: 7f8d59bf247140abf02a2bcd3eee0265496f7dcd
branch: master
specs:
omnibus-software (4.0.0)