aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Moss <me@jonathanmoss.me>2016-06-06 23:10:37 -0400
committerJon Moss <me@jonathanmoss.me>2016-06-06 23:10:37 -0400
commit0c330888d617e39630de7847b3ef637bf6bdc943 (patch)
treef822d7fe51381870d86e697d226683afa66ec3f4
parent1621eda81d6abcc13c7755606752710b5d84c49b (diff)
downloadrails-0c330888d617e39630de7847b3ef637bf6bdc943.tar.gz
rails-0c330888d617e39630de7847b3ef637bf6bdc943.tar.bz2
rails-0c330888d617e39630de7847b3ef637bf6bdc943.zip
Require Nokogiri >= 1.6.8
per security release today --> https://groups.google.com/forum/#!topic/ruby-security-ann/RCHyF5K9Lbc
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock20
2 files changed, 13 insertions, 9 deletions
diff --git a/Gemfile b/Gemfile
index 826dcc8ff5..5650147099 100644
--- a/Gemfile
+++ b/Gemfile
@@ -89,7 +89,7 @@ group :test do
end
platforms :ruby, :mswin, :mswin64, :mingw, :x64_mingw do
- gem 'nokogiri', '>= 1.6.7.1'
+ gem 'nokogiri', '>= 1.6.8'
# Needed for compiling the ActionDispatch::Journey parser.
gem 'racc', '>=1.4.6', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 689651c5c2..8b31934301 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -208,7 +208,7 @@ GEM
mime-types (3.0)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0221)
- mini_portile2 (2.0.0)
+ mini_portile2 (2.1.0)
minitest (5.3.3)
mocha (0.14.0)
metaclass (~> 0.0.1)
@@ -220,15 +220,19 @@ GEM
mysql2 (0.4.4-x64-mingw32)
mysql2 (0.4.4-x86-mingw32)
nio4r (1.2.1)
- nokogiri (1.6.7.2)
- mini_portile2 (~> 2.0.0.rc2)
- nokogiri (1.6.7.2-x64-mingw32)
- mini_portile2 (~> 2.0.0.rc2)
- nokogiri (1.6.7.2-x86-mingw32)
- mini_portile2 (~> 2.0.0.rc2)
+ nokogiri (1.6.8)
+ mini_portile2 (~> 2.1.0)
+ pkg-config (~> 1.1.7)
+ nokogiri (1.6.8-x64-mingw32)
+ mini_portile2 (~> 2.1.0)
+ pkg-config (~> 1.1.7)
+ nokogiri (1.6.8-x86-mingw32)
+ mini_portile2 (~> 2.1.0)
+ pkg-config (~> 1.1.7)
pg (0.18.4)
pg (0.18.4-x64-mingw32)
pg (0.18.4-x86-mingw32)
+ pkg-config (1.1.7)
psych (2.0.17)
puma (3.4.0)
qu (0.2.0)
@@ -365,7 +369,7 @@ DEPENDENCIES
minitest (< 5.3.4)
mocha (~> 0.14)
mysql2 (>= 0.4.4)
- nokogiri (>= 1.6.7.1)
+ nokogiri (>= 1.6.8)
pg (>= 0.18.0)
psych (~> 2.0)
puma