summaryrefslogtreecommitdiff
path: root/Gemfile
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
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')
-rw-r--r--Gemfile4
1 files changed, 1 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index f92dc7be14..30d573a2b0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -57,9 +57,7 @@ end
group(:chefstyle) do
# for testing new chefstyle rules
- # disabled until we resolve the conflict in regexp_parser deps between rubocop and inspec
- # gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
- gem "chefstyle", "= 1.5.2"
+ gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
end
instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]