summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@chef.io>2019-05-01 17:32:24 -0700
committerGitHub <noreply@github.com>2019-05-01 17:32:24 -0700
commitb84859b52212ab21fb5ab3d344ac3f9627c98e98 (patch)
treef62ca405aad6642502221b059a1e783693253455
parentb7ff360253e45f824b47c5ac5e194739fdf12314 (diff)
parent561ecf50976f41700ef74b0938e48492f5dcf810 (diff)
downloadchef-b84859b52212ab21fb5ab3d344ac3f9627c98e98.tar.gz
Merge pull request #8449 from chef/lcg/chefstyle-group
add a group for chefstyle so it can be excluded
-rw-r--r--Gemfile2
-rw-r--r--omnibus/Gemfile.lock2
2 files changed, 3 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 0c3b6ef85b..c358744401 100644
--- a/Gemfile
+++ b/Gemfile
@@ -64,7 +64,9 @@ group(:development, :test) do
gem "rspec_junit_formatter", "~> 0.2.0"
gem "simplecov"
gem "webmock"
+end
+group(:chefstyle) do
# for testing new chefstyle rules
gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
end
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index a8a4c45403..6279cc3017 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: d69c192f4d66fe070ff946778853be32734d4928
+ revision: 330e1d8e37898577de97323bd1416f014c571289
branch: master
specs:
omnibus-software (4.0.0)