From 991d83f8ed2c7fc2f8ea36ca0ba62a30c43d0dff Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Thu, 10 Dec 2015 11:25:25 -0500 Subject: [PATCH] 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. --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index ac068c8402..3d580698de 100644 --- a/Gemfile +++ b/Gemfile @@ -81,7 +81,7 @@ group :test do end platforms :ruby do - gem 'nokogiri', '>= 1.6.7.rc3' + gem 'nokogiri', '>= 1.6.7' # Needed for compiling the ActionDispatch::Journey parser. gem 'racc', '>=1.4.6', require: false 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!