diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2016-06-07 11:12:56 -0400 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2016-06-07 11:12:56 -0400 |
| commit | 4b44a39e437393dbd7dd4687f3acbffc95a8cdab (patch) | |
| tree | 1eb69b0bf967716082d5a63394793c614e06d5dc /Gemfile.lock | |
| parent | b24d44edbb4726d06df782dc5b4b0e52db467d97 (diff) | |
| parent | 0c330888d617e39630de7847b3ef637bf6bdc943 (diff) | |
| download | rails-4b44a39e437393dbd7dd4687f3acbffc95a8cdab.tar.gz rails-4b44a39e437393dbd7dd4687f3acbffc95a8cdab.tar.bz2 rails-4b44a39e437393dbd7dd4687f3acbffc95a8cdab.zip | |
Merge pull request #25309 from maclover7/jm-bump-nokogiri
Require Nokogiri >= 1.6.8
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 689651c5c2..8b31934301 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -208,7 +208,7 @@ GEM mime-types (3.0) mime-types-data (~> 3.2015) mime-types-data (3.2016.0221) - mini_portile2 (2.0.0) + mini_portile2 (2.1.0) minitest (5.3.3) mocha (0.14.0) metaclass (~> 0.0.1) @@ -220,15 +220,19 @@ GEM mysql2 (0.4.4-x64-mingw32) mysql2 (0.4.4-x86-mingw32) nio4r (1.2.1) - nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) - nokogiri (1.6.7.2-x64-mingw32) - mini_portile2 (~> 2.0.0.rc2) - nokogiri (1.6.7.2-x86-mingw32) - mini_portile2 (~> 2.0.0.rc2) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) + nokogiri (1.6.8-x64-mingw32) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) + nokogiri (1.6.8-x86-mingw32) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) pg (0.18.4) pg (0.18.4-x64-mingw32) pg (0.18.4-x86-mingw32) + pkg-config (1.1.7) psych (2.0.17) puma (3.4.0) qu (0.2.0) @@ -365,7 +369,7 @@ DEPENDENCIES minitest (< 5.3.4) mocha (~> 0.14) mysql2 (>= 0.4.4) - nokogiri (>= 1.6.7.1) + nokogiri (>= 1.6.8) pg (>= 0.18.0) psych (~> 2.0) puma |