Emilio Tagua 8ee0b44148 Merge remote branch 'rails/master' into identity_map ...

Conflicts:
	activerecord/examples/performance.rb
	activerecord/lib/active_record/association_preload.rb
	activerecord/lib/active_record/associations.rb
	activerecord/lib/active_record/associations/association_proxy.rb
	activerecord/lib/active_record/autosave_association.rb
	activerecord/lib/active_record/base.rb
	activerecord/lib/active_record/nested_attributes.rb
	activerecord/test/cases/relations_test.rb

2011-02-15 12:01:04 -03:00

..

.gitignore

Benchmark script via miloops' arel fork via DataMapper's AR comparison script

2009-08-20 21:09:59 -07:00

associations.png

Initial

2004-11-24 01:04:44 +00:00

performance.rb

Merge remote branch 'rails/master' into identity_map

2011-02-15 12:01:04 -03:00

simple.rb

Simple examples for require profiling

2009-05-13 12:00:49 -07:00