Merge branch 'master' of git://github.com/mikel/rails into mail

Conflicts:
	actionmailer/lib/action_mailer.rb

1 files changed, 12 insertions, 3 deletions

diff --git a/Gemfile b/Gemfile
index 87bf43b786..8e420b1c64 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,11 +1,17 @@
 gem "rake", ">= 0.8.7"
 gem "mocha", ">= 0.9.8"
 
-gem "rails", "3.0.pre", :vendored_at => "railties"
+gem "rails", "3.0.pre", :path => "railties"
 %w(activesupport activemodel actionpack actionmailer activerecord activeresource).each do |lib|
-  gem lib, '3.0.pre', :vendored_at => lib
+  gem lib, '3.0.pre', :path => lib
 end
 
+# AS
+gem "i18n", ">= 0.3.0"
+
+# AM
+gem "mail", ">= 1.4.2"
+
 # AR
 gem "arel", "0.2.pre", :git => "git://github.com/rails/arel.git"
 gem "sqlite3-ruby", ">= 1.2.5"
@@ -13,7 +19,8 @@ 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", "1.1.0", :git => "git://github.com/rack/rack.git"
+gem "rack-test", "0.5.3"
 gem "RedCloth", ">= 4.2.2"
 
 if ENV['CI']
@@ -30,3 +37,5 @@ if ENV['CI']
     gem "test-unit", ">= 2.0.5"
   end
 end
+
+disable_system_gems