Merge pull request #22646 from maclover7/master

Require Nokogiri >= 1.6.7.1

Merge pull request #22646 from maclover7/master
Require Nokogiri >= 1.6.7.1
1fca600b · Guillermo Iguaran · 84eba99c · 5d8ee125 · 1fca600b · 1fca600b
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

Gemfile Gemfile +1 -1

Gemfile.lock Gemfile.lock +1 -1

未找到文件。
--- a/Gemfile
+++ b/Gemfile
@@ -85,7 +85,7 @@ group :test do
 end

 platforms :ruby, :mswin, :mswin64, :mingw, :x64_mingw do
-  gem 'nokogiri', '>= 1.6.7'
+  gem 'nokogiri', '>= 1.6.7.1'

  # Needed for compiling the ActionDispatch::Journey parser.
  gem 'racc', '>=1.4.6', require: false

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -327,7 +327,7 @@ DEPENDENCIES
  mocha (~> 0.14)
  mysql (>= 2.9.0)
  mysql2 (>= 0.4.0)
-  nokogiri (>= 1.6.7)
+  nokogiri (>= 1.6.7.1)
  pg (>= 0.18.0)
  psych (~> 2.0)
  puma