Jon Leighton 735844db71 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		2011-03-04 09:30:27 +00:00
..
middleware_stack	Merge branch 'master' into nested_has_many_through	2011-03-04 09:30:27 +00:00
request
session	cleaning up some warnings on 1.9.3	2011-02-07 16:44:27 -08:00
callbacks_test.rb	Don't deprecate to_prepare.	2010-12-23 19:21:14 +01:00
cookies_test.rb	Add tld_length option when using domain :all in cookies	2011-01-21 13:13:51 +01:00
header_test.rb
middleware_stack_test.rb
mime_type_test.rb	Use Mime::Type references.	2011-02-08 14:14:26 -08:00
mount_test.rb	Check if the routes object really responds to define_mount_prefix.	2010-12-09 13:15:25 +01:00
prefix_generation_test.rb
rack_test.rb
reloader_test.rb	Clean up callbacks should also be called on exceptions.	2010-12-23 19:17:02 +01:00
request_test.rb	cleaning up some warnings on 1.9.3	2011-02-07 16:44:27 -08:00
response_test.rb	cleaning up some warnings on 1.9.3	2011-02-07 16:44:27 -08:00
routing_assertions_test.rb	Fix assert_recognizes with block constraints [#5805 state:resolved]	2011-02-13 23:24:46 +00:00
routing_test.rb	Add test to prevent regression on namespace root nested in a resource	2011-02-14 06:12:22 +00:00
show_exceptions_test.rb
static_test.rb
test_request_test.rb
test_response_test.rb
uploaded_file_test.rb
url_generation_test.rb