rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Collapse)	Author	Age	Files	Lines
...
*	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.