diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-06-08 21:23:29 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-06-08 21:23:29 +0200 |
| commit | 751f79a03351f1f0d21436b2b947352b97ded093 (patch) | |
| tree | 9dd053597389241398c9173ab7f565697bef055f /Gemfile | |
| parent | e7e6ee3e7b075f5447697a6038cb46d65f9b137a (diff) | |
| parent | ab2877cbe89e266ee986fc12e603abd93ac017ad (diff) | |
| download | rails-751f79a03351f1f0d21436b2b947352b97ded093.tar.gz rails-751f79a03351f1f0d21436b2b947352b97ded093.tar.bz2 rails-751f79a03351f1f0d21436b2b947352b97ded093.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -29,10 +29,10 @@ gem "text-format", "~> 1.0.0" # AR if mri || RUBY_ENGINE == "rbx" - gem "sqlite3-ruby", "= 1.3.0.beta.2", :require => 'sqlite3' + gem "sqlite3-ruby", "~> 1.3.0", :require => 'sqlite3' group :db do - gem "pg", ">= 0.9.0" + # gem "pg", ">= 0.9.0" gem "mysql", ">= 2.8.1" end elsif RUBY_ENGINE == "jruby" @@ -46,6 +46,7 @@ end # AP gem "RedCloth", ">= 4.2.2" +gem "bluecloth", ">= 2.0.7" group :documentation do gem 'rdoc', '2.1' |