This project is archived and is in readonly mode.
Changeset [248391a7e11e9fa5ffe312cb380034691430acc5] by Jeremy Kemper
Revision 248391a7e11e9fa5ffe312cb380034691430acc5,
committed by Jeremy Kemper
· December 18th, 2008 @ 10:49 PM
Merge branch 'master' of git@github.com:rails/rails http://github.com/rails/rails/co...
14 changed files
-
M
activerecord/lib/active_record/association_preload.rb -
M
activerecord/lib/active_record/associations.rb -
M
activerecord/lib/active_record/associations/association_collection.rb -
M
activerecord/lib/active_record/base.rb -
M
activerecord/lib/active_record/connection_adapters/mysql_adapter.rb -
M
activerecord/test/cases/associations/eager_test.rb -
M
activerecord/test/cases/associations/has_many_through_associations_test.rb -
M
activerecord/test/cases/associations/has_one_through_associations_test.rb -
M
activerecord/test/fixtures/member_types.yml -
M
activerecord/test/fixtures/members.yml -
M
activerecord/test/models/member.rb -
M
activerecord/test/models/member_detail.rb -
M
activerecord/test/models/member_type.rb -
M
activerecord/test/schema/schema.rb