diff options
| author | Jeremy Daer <jeremydaer@gmail.com> | 2015-12-10 12:12:47 -0700 |
|---|---|---|
| committer | Jeremy Daer <jeremydaer@gmail.com> | 2015-12-10 12:12:47 -0700 |
| commit | 2747e84be2f4a606e3178bbcc8ac95765deb0405 (patch) | |
| tree | d20dceb6f958223d1a167c6193d4cd57f3e9cfeb /Gemfile.lock | |
| parent | 0dfca1db2a9d78f7211ce450b5300b0f6f41953e (diff) | |
| parent | 991d83f8ed2c7fc2f8ea36ca0ba62a30c43d0dff (diff) | |
| download | rails-2747e84be2f4a606e3178bbcc8ac95765deb0405.tar.gz rails-2747e84be2f4a606e3178bbcc8ac95765deb0405.tar.bz2 rails-2747e84be2f4a606e3178bbcc8ac95765deb0405.zip | |
Merge pull request #22552 from tamird/nokogiri-1.6.7
Update nokogiri to 1.6.7
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 6c31a26a25..d7abc12b21 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -230,7 +230,7 @@ GEM metaclass (0.0.4) method_source (0.8.2) mime-types (2.6.2) - mini_portile (0.7.0.rc4) + mini_portile2 (2.0.0) minitest (5.3.3) mocha (0.14.0) metaclass (~> 0.0.1) @@ -239,8 +239,8 @@ GEM mustache (1.0.2) mysql (2.9.1) mysql2 (0.4.1) - nokogiri (1.6.7.rc3) - mini_portile (~> 0.7.0.rc4) + nokogiri (1.6.7) + mini_portile2 (~> 2.0.0.rc2) pg (0.18.3) psych (2.0.15) que (0.11.2) @@ -348,7 +348,7 @@ DEPENDENCIES mocha (~> 0.14) mysql (>= 2.9.0) mysql2 (>= 0.4.0) - nokogiri (>= 1.6.7.rc3) + nokogiri (>= 1.6.7) pg (>= 0.18.0) psych (~> 2.0) qu-rails! |