diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2015-12-17 17:45:42 -0500 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2015-12-17 17:45:42 -0500 |
| commit | 1fca600b18c7bb6720450b2b80c1859f48d54d66 (patch) | |
| tree | b11c428d68d2ba0418b5fd4e241ba61b5805f53a | |
| parent | 84eba99cebc0afc1fde725d491170523cc6189ad (diff) | |
| parent | 5d8ee1250f028d9e0650fb65681c9c5ae49bece4 (diff) | |
| download | rails-1fca600b18c7bb6720450b2b80c1859f48d54d66.tar.gz rails-1fca600b18c7bb6720450b2b80c1859f48d54d66.tar.bz2 rails-1fca600b18c7bb6720450b2b80c1859f48d54d66.zip | |
Merge pull request #22646 from maclover7/master
Require Nokogiri >= 1.6.7.1
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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 diff --git a/Gemfile.lock b/Gemfile.lock index 8cf764797c..1006143f54 100644 --- 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 |