Jon Leighton d010fb13ef Merge branch 'master' into nested_has_many_through ...

Conflicts:
	activerecord/lib/active_record/associations/has_many_association.rb
	activerecord/lib/active_record/associations/through_association_scope.rb

2010-10-31 10:04:56 +00:00

..

assets

move assets and models

2008-01-18 07:27:03 +00:00

cases

Merge branch 'master' into nested_has_many_through

2010-10-31 10:04:56 +00:00

connections

reducing the number of parameters to select()

2010-10-26 13:43:06 -07:00

fixtures

Support the :primary_key option on a through reflection in a nested through association

2010-10-19 16:13:06 +01:00

migrations

Change the method for copying migrations, do not add scope.

2010-10-09 21:32:34 +02:00

models

Merge branch 'master' into nested_has_many_through

2010-10-31 10:04:56 +00:00

schema

Merge branch 'master' into nested_has_many_through

2010-10-28 18:06:01 +01:00

config.rb

Merge branch 'ar-test-cleanup' of git://git.geeksomnia.com/rails

2008-01-21 17:20:51 +00:00