Merge remote branch 'mainstream/master'

Conflicts:
	activesupport/lib/active_support/core_ext/hash/conversions.rb

1 files changed, 36 insertions, 0 deletions

diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000000..8f4fed2cdd
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,36 @@
+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|
+  gem lib, '3.0.pre', :vendored_at => lib
+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 "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