aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock21
2 files changed, 13 insertions, 10 deletions
diff --git a/Gemfile b/Gemfile
index e53891667e..af6e43d173 100644
--- a/Gemfile
+++ b/Gemfile
@@ -119,7 +119,7 @@ group :test do
end
platforms :ruby, :mswin, :mswin64, :mingw, :x64_mingw do
- gem "nokogiri", ">= 1.6.8"
+ gem "nokogiri", ">= 1.8.1"
# Needed for compiling the ActionDispatch::Journey parser.
gem "racc", ">=1.4.6", require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 7bb207027c..8dc20f1ad3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -305,7 +305,7 @@ GEM
mime-types-data (3.2016.0521)
mini_magick (4.8.0)
mini_mime (0.1.4)
- mini_portile2 (2.2.0)
+ mini_portile2 (2.3.0)
minitest (5.10.3)
minitest-bisect (1.4.0)
minitest-server (~> 1.0)
@@ -327,13 +327,14 @@ GEM
mysql2 (0.4.9-x64-mingw32)
mysql2 (0.4.9-x86-mingw32)
nio4r (2.1.0)
- nokogiri (1.8.0)
- mini_portile2 (~> 2.2.0)
- nokogiri (1.8.0-java)
- nokogiri (1.8.0-x64-mingw32)
- mini_portile2 (~> 2.2.0)
- nokogiri (1.8.0-x86-mingw32)
- mini_portile2 (~> 2.2.0)
+ nio4r (2.1.0-java)
+ nokogiri (1.8.1)
+ mini_portile2 (~> 2.3.0)
+ nokogiri (1.8.1-java)
+ nokogiri (1.8.1-x64-mingw32)
+ mini_portile2 (~> 2.3.0)
+ nokogiri (1.8.1-x86-mingw32)
+ mini_portile2 (~> 2.3.0)
os (0.9.6)
parallel (1.12.0)
parser (2.4.0.0)
@@ -483,6 +484,8 @@ GEM
websocket (1.2.4)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
+ websocket-driver (0.6.5-java)
+ websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
xpath (2.1.0)
nokogiri (~> 1.3)
@@ -522,7 +525,7 @@ DEPENDENCIES
minitest-bisect
mocha
mysql2 (>= 0.4.4)
- nokogiri (>= 1.6.8)
+ nokogiri (>= 1.8.1)
pg (>= 0.18.0)
psych (~> 2.0)
puma