diff options
author | José Valim <jose.valim@gmail.com> | 2009-11-23 22:04:18 -0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2009-11-23 22:04:18 -0200 |
commit | 4ff66b6b85d1351e447f18c027f1dba6bcf23a7b (patch) | |
tree | a46d6c65c5c67964bc8658bf991157f0f8056f55 /Gemfile | |
parent | 01ae99c681d31803f3a29f8305c9a041aa456660 (diff) | |
parent | 934bb012ba3f1da5cd181ae5c2d84f697a3c58a1 (diff) | |
download | rails-4ff66b6b85d1351e447f18c027f1dba6bcf23a7b.tar.gz rails-4ff66b6b85d1351e447f18c027f1dba6bcf23a7b.tar.bz2 rails-4ff66b6b85d1351e447f18c027f1dba6bcf23a7b.zip |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -1,6 +1,3 @@ -clear_sources -source 'http://gemcutter.org' - gem "rake", ">= 0.8.7" gem "mocha", ">= 0.9.8" @@ -12,12 +9,11 @@ end # AR gem "arel", "0.2.pre", :git => "git://github.com/rails/arel.git" gem "sqlite3-ruby", ">= 1.2.5" +gem "pg", ">= 0.8.0" +gem "mysql", ">= 2.8.1" # AP gem "rack", "1.0.1", :git => "git://github.com/rails/rack.git" -gem "rack-mount", :git => "git://github.com/rails/rack-mount.git" -gem "rack-test", ">= 0.5.0" -gem "erubis", ">= 2.6.5" gem "RedCloth", ">= 4.2.2" if ENV['CI'] @@ -25,8 +21,6 @@ if ENV['CI'] gem "nokogiri", ">= 1.4.0" gem "memcache-client", ">= 1.7.6" - gem "pg", ">= 0.8.0" - gem "mysql", ">= 2.8.1" # fcgi gem doesn't compile on 1.9 # avoid minitest strangeness on 1.9 |