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 |
|
Szymon Nowak
|
85683f2a79
|
Fix creation of has_many through records with custom primary_key option on belongs_to [#2990 state:resolved]
|
2010-12-23 15:19:17 -08:00 |
|
Jon Leighton
|
14b880fd03
|
Fix various issues with the :primary_key option in :through associations [#2421 state:resolved]
|
2010-12-15 17:50:14 -08:00 |
|
Jon Leighton
|
491ce5b6ce
|
Verify that creating a has_many through record where there is a default_scope on the join model works correctly (creates the join record with the default scope applied)
|
2010-12-16 01:49:30 +05:30 |
|
Jon Leighton
|
9a1a32ac2b
|
Fix naughty trailing whitespace
|
2010-10-31 11:21:28 +00:00 |
|
Jon Leighton
|
25acd19da5
|
Add test_has_many_through_belongs_to_with_has_many_through_source_reflection (which already passes)
|
2010-10-14 13:16:47 +01:00 |
|
Jeremy Kemper
|
43b81d01d0
|
move assets and models
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8657 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
|
2008-01-18 07:27:03 +00:00 |
|