diff options
| author | Tim Smith <tsmith@chef.io> | 2018-03-27 10:47:16 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-27 10:47:16 -0700 |
| commit | 37762c45d7981f715794938444e8cf577176d5f4 (patch) | |
| tree | be37270028ed6183b7331168ab62006acff31052 | |
| parent | 909456260c5c66b87e763e4b01daf799db9c36d1 (diff) | |
| parent | dd8d02e42e14f9fec5786a73cbf78c305fdf02f7 (diff) | |
| download | ohai-37762c45d7981f715794938444e8cf577176d5f4.tar.gz | |
Merge pull request #1169 from chef/style_and_gems
Exclude example output from rubocop rules & remove changelog generator gem
| -rw-r--r-- | .rubocop.yml | 6 | ||||
| -rw-r--r-- | Gemfile | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index bb40a25f..f1e7a135 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -4,3 +4,9 @@ AllCops: - "vendor/**/*" - "pkg/**/*" - "spec/unit/plugins/darwin/system_profiler_output.rb" + +# these have shellout examples that need to have the tabs that come with the shellout +Layout/Tab: + Exclude: + - "lib/ohai/plugins/mono.rb" + - "lib/ohai/plugins/darwin/hardware.rb" @@ -17,10 +17,6 @@ group :ci do gem "rspec_junit_formatter" end -group :changelog do - gem "github_changelog_generator", git: "https://github.com/chef/github-changelog-generator" -end - instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"] # If you want to load debugging tools into the bundle exec sandbox, |