diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-07-31 11:55:24 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-07-31 11:55:24 +0200 |
| commit | 3d7099891f07395ed889e7da9e13b3ff9244d539 (patch) | |
| tree | 6a988362ec4a6b58c90a12e6b715cd6926a111ce /Gemfile | |
| parent | 0e20e3ebc20250174867f33e0ad3972f7e7c76d0 (diff) | |
| parent | d3819daaac0d2f730f2b34af31700c914e697375 (diff) | |
| download | rails-3d7099891f07395ed889e7da9e13b3ff9244d539.tar.gz rails-3d7099891f07395ed889e7da9e13b3ff9244d539.tar.bz2 rails-3d7099891f07395ed889e7da9e13b3ff9244d539.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -27,7 +27,7 @@ end platforms :ruby do gem 'json' gem 'yajl-ruby' - gem "nokogiri", ">= 1.4.2" + gem "nokogiri", ">= 1.4.3.1" # AR gem "sqlite3-ruby", "~> 1.3.1", :require => 'sqlite3' @@ -50,7 +50,7 @@ platforms :jruby do end env 'CI' do - gem "nokogiri", ">= 1.4.2" + gem "nokogiri", ">= 1.4.3.1" platforms :ruby_18 do # fcgi gem doesn't compile on 1.9 |