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 |
|
Jon Leighton
|
3fa61ccb9e
|
Has many through - It is not necessary to manually merge in the conditions hash for the through record, because the creation is done directly on the through association, which will already handle setting the conditions.
|
2011-01-30 11:58:09 +00:00 |
|
Jon Leighton
|
002985fb66
|
Add test_has_one_through_has_one_through_with_belongs_to_source_reflection
|
2010-10-14 13:44:32 +01:00 |
|
Pratik Naik
|
691aa20280
|
Ensure methods called on association proxies respect access control. [#1083 state:resolved] [Adam Milligan, Pratik]
|
2008-10-13 19:02:34 +02:00 |
|
Jeremy Kemper
|
5c1be2812d
|
has_one :through supports :source_type. Fix up some tests. References #4756.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9075 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
|
2008-03-22 02:20:37 +00:00 |
|
Rick Olson
|
273b21faa9
|
Add has_one :through support, finally. Closes #4756 [thechrisoshow]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9067 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
|
2008-03-21 18:09:03 +00:00 |
|