Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Fix a couple of tests in join_model_test.rb which were failing when the ↵ | Jon Leighton | 2011-03-04 | 1 | -2/+2 | |
| | | | | identity map is turned off | |||||
* | Rename target_klass to klass | Jon Leighton | 2011-02-21 | 1 | -7/+7 | |
| | ||||||
* | Delegate Association#options to the reflection, and replace ↵ | Jon Leighton | 2011-02-21 | 1 | -6/+6 | |
| | | | | 'reflection.options' with 'options'. Also add through_options and source_options methods for through associations. | |||||
* | Associations - where possible, call attributes methods rather than directly ↵ | Jon Leighton | 2011-02-21 | 1 | -23/+23 | |
| | | | | accessing the instance variables | |||||
* | Initialize @target instead asking if it is defined. | Emilio Tagua | 2011-02-18 | 1 | -1/+2 | |
| | ||||||
* | Reindent and remove wrong line left in merge by mistake. | Emilio Tagua | 2011-02-18 | 1 | -4/+3 | |
| | ||||||
* | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-18 | 1 | -0/+16 | |
| | | | | | | Conflicts: activerecord/lib/active_record/associations/association.rb activerecord/lib/active_record/fixtures.rb | |||||
* | Split AssociationProxy into an Association class (and subclasses) which ↵ | Jon Leighton | 2011-02-18 | 1 | -0/+246 | |
manages the association, and a CollectionProxy class which is *only* a proxy. Singular associations no longer have a proxy. See CHANGELOG for more. |