735844db71
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 |
||
|---|---|---|
| .. | ||
| fixtures | ||
| mailers | ||
| old_base | ||
| abstract_unit.rb | ||
| asset_host_test.rb | ||
| base_test.rb | ||
| delivery_methods_test.rb | ||
| i18n_with_controller_test.rb | ||
| log_subscriber_test.rb | ||
| mail_helper_test.rb | ||
| mail_layout_test.rb | ||
| test_helper_test.rb | ||
| url_test.rb | ||