Merge commit 'origin/master' into mail

1 files changed, 29 insertions, 16 deletions

diff --git a/Gemfile b/Gemfile
index a60c1010d9..6d1472f2c3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,22 +1,35 @@
 clear_sources
 source 'http://gemcutter.org'
 
+gem "rake", ">= 0.8.7"
+gem "mocha", ">= 0.9.8"
+
 gem "rails", "3.0.pre", :vendored_at => "railties"
-%w(
-  activesupport
-  activemodel
-  actionpack
-  actionmailer
-  activerecord
-  activeresource
-).each do |lib|
+%w(activesupport activemodel actionpack actionmailer activerecord activeresource).each do |lib|
   gem lib, '3.0.pre', :vendored_at => lib
 end
-gem "rack",          "1.0.1"
-gem "rack-mount",    :git => "git://github.com/rails/rack-mount.git"
-gem "rack-test",     "~> 0.5.0"
-gem "erubis",        "~> 2.6.0"
-gem "arel", "0.1.3", :git => "git://github.com/rails/arel.git"
-gem "mocha"
-gem "sqlite3-ruby"
-gem "RedCloth"
+
+# 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 "RedCloth", ">= 4.2.2"
+
+if ENV['CI']
+  disable_system_gems
+
+  gem "nokogiri", ">= 1.4.0"
+  gem "memcache-client", ">= 1.7.6"
+
+  # fcgi gem doesn't compile on 1.9
+  # avoid minitest strangeness on 1.9
+  if RUBY_VERSION < '1.9.0'
+    gem "fcgi", ">= 0.8.7"
+  else
+    gem "test-unit", ">= 2.0.5"
+  end
+end