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
..
2010-04-25 16:04:38 +02:00
2010-04-25 16:04:38 +02:00
2011-03-04 09:30:27 +00:00
2008-01-18 07:27:03 +00:00
2008-01-18 07:27:03 +00:00
2010-01-08 21:45:02 +01:00
2010-09-26 22:25:25 +10:00
2010-08-14 18:49:04 -03:00
2011-01-30 11:56:41 +00:00
2010-09-18 20:49:19 +02:00
2011-03-04 09:30:27 +00:00
2011-03-04 09:30:27 +00:00
2008-01-18 07:27:03 +00:00
2011-03-04 09:30:27 +00:00
2008-01-18 07:27:03 +00:00
2011-03-04 09:30:27 +00:00
2010-07-25 23:30:27 +02:00
2011-02-14 01:40:31 +00:00
2008-01-18 07:27:03 +00:00
2011-02-04 13:34:57 -08:00
2010-12-16 01:49:30 +05:30
2010-07-20 16:45:42 -07:00
2008-01-18 07:27:03 +00:00
2011-01-07 14:30:20 -08:00
2010-07-13 08:14:52 +02:00
2008-01-18 07:27:03 +00:00
2010-10-11 11:54:46 -02:00
2008-01-18 07:27:03 +00:00
2010-08-02 17:12:59 +02:00
2010-09-18 20:49:19 +02:00
2008-01-18 07:27:03 +00:00
2010-10-19 14:14:06 +01:00
2009-03-07 13:52:17 +00:00
2010-11-09 13:54:04 -02:00
2009-12-28 15:12:17 +01:00
2008-05-11 19:30:03 +01:00
2009-12-28 15:12:13 +01:00
2010-01-08 21:45:02 +01:00
2008-01-18 07:27:03 +00:00
2010-10-31 11:21:28 +00:00
2011-02-08 10:31:09 -08:00
2008-01-18 07:27:03 +00:00
2008-01-18 07:27:03 +00:00
2011-02-04 19:39:59 -02:00
2010-01-08 21:45:02 +01:00
2010-08-02 17:12:59 +02:00
2010-07-08 18:28:45 +02:00
2009-12-28 15:12:13 +01:00
2008-01-18 07:27:03 +00:00
2010-10-31 11:21:28 +00:00
2008-12-18 19:19:36 +00:00
2011-03-04 09:30:27 +00:00
2008-03-21 18:09:03 +00:00
2008-01-18 07:27:03 +00:00
2010-08-14 04:12:33 -03:00
2008-01-18 07:27:03 +00:00
2010-08-02 17:12:59 +02:00
2008-01-18 07:27:03 +00:00
2008-01-18 07:27:03 +00:00
2010-10-31 11:21:28 +00:00
2009-03-09 13:43:28 +00:00
2010-01-08 21:45:02 +01:00
2011-03-04 09:30:27 +00:00
2010-11-30 18:46:56 -08:00
2011-01-30 11:56:41 +00:00
2011-03-04 09:30:27 +00:00
2008-02-02 03:27:31 +00:00
2011-02-14 01:40:31 +00:00
2010-10-09 22:00:33 +01:00
2011-02-18 00:00:13 +00:00
2011-03-04 09:30:27 +00:00
2011-01-11 13:45:08 -08:00
2010-05-18 16:13:00 +02:00
2010-05-18 16:13:00 +02:00
2010-08-14 04:12:33 -03:00
2010-07-13 08:14:52 +02:00
2011-01-11 09:19:19 -08:00
2011-02-04 19:39:59 -02:00
2010-11-09 13:54:04 -02:00
2008-04-30 23:30:50 -05:00
2008-05-01 15:03:16 -05:00
2008-01-18 07:27:03 +00:00
2011-03-04 09:30:27 +00:00
2010-12-30 18:42:18 +00:00
2011-01-11 13:45:08 -08:00
2009-03-09 13:43:28 +00:00
2010-12-29 16:15:45 +00:00
2009-09-12 15:37:54 +02:00
2010-07-20 16:45:42 -07:00
2010-08-12 13:10:58 -03:00
2008-01-18 07:27:03 +00:00
2008-01-18 07:27:03 +00:00
2010-07-08 23:24:12 +02:00
2010-06-29 19:50:09 +02:00
2009-05-04 15:27:39 -07:00