aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2017-06-06 17:32:49 +0900
committerAkira Matsuda <ronnie@dio.jp>2017-06-06 17:32:49 +0900
commitd1d39710cc4c525ab8f515eba70cb9ab4134fc64 (patch)
treeee03ead4b4cc0218639cb62ded4b37321ce781db
parent600f0d4bea1c2df2a9efffcb0802c4b48e6c84c9 (diff)
downloadrails-d1d39710cc4c525ab8f515eba70cb9ab4134fc64.tar.gz
rails-d1d39710cc4c525ab8f515eba70cb9ab4134fc64.tar.bz2
rails-d1d39710cc4c525ab8f515eba70cb9ab4134fc64.zip
Let's test nokogiri 1.8 against edge Rails, and vice versa
-rw-r--r--Gemfile.lock16
1 files changed, 8 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index d08ddaf1b4..cd0751a895 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -214,7 +214,7 @@ GEM
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
- mini_portile2 (2.1.0)
+ mini_portile2 (2.2.0)
minitest (5.3.3)
mocha (0.14.0)
metaclass (~> 0.0.1)
@@ -226,12 +226,12 @@ GEM
mysql2 (0.4.6-x64-mingw32)
mysql2 (0.4.6-x86-mingw32)
nio4r (2.0.0)
- nokogiri (1.7.1)
- mini_portile2 (~> 2.1.0)
- nokogiri (1.7.1-x64-mingw32)
- mini_portile2 (~> 2.1.0)
- nokogiri (1.7.1-x86-mingw32)
- mini_portile2 (~> 2.1.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)
parallel (1.11.2)
parser (2.4.0.0)
ast (~> 2.2)
@@ -436,4 +436,4 @@ DEPENDENCIES
websocket-client-simple!
BUNDLED WITH
- 1.15.0
+ 1.15.1