diff options
| author | Noah Kantrowitz <noah@coderanger.net> | 2017-07-06 12:28:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-06 12:28:43 -0700 |
| commit | cba873c6d2623dbb1b7d3df2fa7129408c72cc16 (patch) | |
| tree | 58f10d8e1d82a6aa1a90b9be06f588aa785447b6 | |
| parent | 1da1234ee26dad05e8ca406d226478ef40e88195 (diff) | |
| parent | c2226e5caec7053aa7de755643923e1b65ac9bcc (diff) | |
| download | chef-cba873c6d2623dbb1b7d3df2fa7129408c72cc16.tar.gz | |
Merge pull request #6255 from coderanger/nokogiri-is-back
Add nokogiri to the installer again
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 9 insertions, 2 deletions
@@ -16,8 +16,7 @@ group(:omnibus_package) do gem "appbundler" gem "rb-readline" gem "inspec" - # nokogiri has no ruby-2.4 version for windows so it cannot go into our Gemfile.lock - # gem "nokogiri", ">= 1.7.1" + gem "nokogiri", ">= 1.8" end group(:omnibus_package, :pry) do diff --git a/Gemfile.lock b/Gemfile.lock index 757efb6524..719db3be9f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -212,6 +212,7 @@ GEM little-plugger (~> 1.1) multi_json (~> 1.10) method_source (0.8.2) + mini_portile2 (2.2.0) minitest (5.10.2) mixlib-archive (0.4.1) mixlib-log @@ -245,6 +246,12 @@ GEM net-ssh-gateway (>= 1.2.0) net-telnet (0.1.1) netrc (0.11.0) + nokogiri (1.8.0) + mini_portile2 (~> 2.2.0) + nokogiri (1.8.0-x64-mingw32) + mini_portile2 (~> 2.2.0) + nokogiri (1.8.0-x86-mingw32) + mini_portile2 (~> 2.2.0) nori (2.6.0) octokit (4.7.0) sawyer (~> 0.8.0, >= 0.5.3) @@ -427,6 +434,7 @@ DEPENDENCIES inspec mixlib-install netrc + nokogiri (>= 1.8) octokit ohai (~> 13) pry |