aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorTamir Duberstein <tamird@gmail.com>2015-12-10 11:25:25 -0500
committerTamir Duberstein <tamird@gmail.com>2015-12-10 13:46:08 -0500
commit991d83f8ed2c7fc2f8ea36ca0ba62a30c43d0dff (patch)
treed20dceb6f958223d1a167c6193d4cd57f3e9cfeb /Gemfile.lock
parent0dfca1db2a9d78f7211ce450b5300b0f6f41953e (diff)
downloadrails-991d83f8ed2c7fc2f8ea36ca0ba62a30c43d0dff.tar.gz
rails-991d83f8ed2c7fc2f8ea36ca0ba62a30c43d0dff.tar.bz2
rails-991d83f8ed2c7fc2f8ea36ca0ba62a30c43d0dff.zip
Update nokogiri to 1.6.7
This picks up https://github.com/sparklemotion/nokogiri/pull/1218 which allows nokogiri to compile on Xcode-only OS X systems.
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock8
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!