Merge branch 'master' into nested_has_many_through

Conflicts:
	activerecord/CHANGELOG
	activerecord/lib/active_record/association_preload.rb
	activerecord/lib/active_record/associations.rb
	activerecord/lib/active_record/associations/class_methods/join_dependency.rb
	activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
	activerecord/lib/active_record/associations/has_many_association.rb
	activerecord/lib/active_record/associations/has_many_through_association.rb
	activerecord/lib/active_record/associations/has_one_association.rb
	activerecord/lib/active_record/associations/has_one_through_association.rb
	activerecord/lib/active_record/associations/through_association_scope.rb
	activerecord/lib/active_record/reflection.rb
	activerecord/test/cases/associations/has_many_through_associations_test.rb
	activerecord/test/cases/associations/has_one_through_associations_test.rb
	activerecord/test/cases/reflection_test.rb
	activerecord/test/cases/relations_test.rb
	activerecord/test/fixtures/memberships.yml
	activerecord/test/models/categorization.rb
	activerecord/test/models/category.rb
	activerecord/test/models/member.rb
	activerecord/test/models/reference.rb
	activerecord/test/models/tagging.rb

1 files changed, 12 insertions, 13 deletions

diff --git a/Gemfile b/Gemfile
index 4e13331626..7d8949409c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,7 @@
 source 'http://rubygems.org'
 
+gemspec
+
 if ENV['AREL']
   gem "arel", :path => ENV['AREL']
 else
@@ -7,23 +9,20 @@ else
 end
 
 gem "rack", :git => "git://github.com/rack/rack.git"
-gem "rails", :path => File.dirname(__FILE__)
+gem "rack-test", :git => "git://github.com/brynary/rack-test.git"
 
 gem "rake",  ">= 0.8.7"
 gem "mocha", ">= 0.9.8"
-gem "rdoc",  ">= 2.5.10"
-gem "horo",  ">= 1.0.2"
 
-# for perf tests
-gem "faker"
-gem "rbench"
-gem "addressable"
+group :doc do
+  gem "rdoc",  "~> 3.4"
+  gem "horo",  "= 1.0.3"
+  gem "RedCloth", "~> 4.2" if RUBY_VERSION < "1.9.3"
+end
 
 # AS
 gem "memcache-client", ">= 1.8.5"
-
-# AM
-gem "text-format", "~> 1.0.0"
+gem "fssm", "~> 0.2.5"
 
 platforms :mri_18 do
   gem "system_timer"
@@ -33,7 +32,7 @@ end
 
 platforms :mri_19 do
   # TODO: Remove the conditional when ruby-debug19 supports Ruby >= 1.9.3
-  gem "ruby-debug19" if RUBY_VERSION < "1.9.3"
+  gem "ruby-debug19", :require => 'ruby-debug' if RUBY_VERSION < "1.9.3"
 end
 
 platforms :ruby do
@@ -42,12 +41,12 @@ platforms :ruby do
   gem "nokogiri", ">= 1.4.4"
 
   # AR
-  gem "sqlite3-ruby", "~> 1.3.1", :require => 'sqlite3'
+  gem "sqlite3", "~> 1.3.3"
 
   group :db do
     gem "pg", ">= 0.9.0"
     gem "mysql", ">= 2.8.1"
-    gem "mysql2", ">= 0.2.6"
+    gem "mysql2", :git => "git://github.com/brianmario/mysql2.git"
   end
 end