aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/association.rb
Commit message (Expand)AuthorAgeFilesLines
...
* Reindent and remove wrong line left in merge by mistake.Emilio Tagua2011-02-181-4/+3
* Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-181-0/+16
* Split AssociationProxy into an Association class (and subclasses) which manag...Jon Leighton2011-02-181-0/+246