Permalink
Switch branches/tags
Commits on Apr 15, 2011
Commits on Apr 5, 2011
  1. Disable IdentityMap in log tests, it's not important and when running…

    miloops authored and josevalim committed Apr 5, 2011
    … tests rake task it logs more messages in the tested buffer.
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
Commits on Apr 4, 2011
  1. Add log message when loading records from Identity Map.

    miloops authored and josevalim committed Apr 3, 2011
    Signed-off-by: José Valim <jose.valim@gmail.com>
  2. Use IM when trying to load records using ID.

    miloops authored and josevalim committed Apr 3, 2011
    Signed-off-by: José Valim <jose.valim@gmail.com>
Commits on Feb 18, 2011
  1. We really don't care about IM middleware order, the important is that…

    miloops authored and tenderlove committed Feb 18, 2011
    … it gets included.
  2. Merge remote branch 'rails/master' into identity_map

    miloops committed Feb 18, 2011
    Conflicts:
    	activerecord/lib/active_record/associations/association.rb
    	activerecord/lib/active_record/fixtures.rb
Commits on Feb 15, 2011
  1. Merge remote branch 'rails/master' into identity_map

    miloops committed Feb 15, 2011
    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
Commits on Dec 20, 2010
  1. Merge remote branch 'rails/master' into identity_map

    miloops committed Dec 20, 2010
    Conflicts:
    	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/persistence.rb
Commits on Nov 25, 2010
  1. Remove explicit return.

    miloops authored and spastorino committed Nov 25, 2010
    Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
  2. Use ternary instead explicit return.

    miloops authored and spastorino committed Nov 25, 2010
    Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
  3. Remove return, we are already returning self.

    miloops authored and spastorino committed Nov 25, 2010
    Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
  4. Remove explicit return.

    miloops authored and spastorino committed Nov 25, 2010
    Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
  5. Reuse lock_col variable instead calling locking_column class method.

    miloops authored and spastorino committed Nov 25, 2010
    Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Commits on Nov 23, 2010
  1. Refactor && simplify count_records.

    miloops authored and tenderlove committed Nov 20, 2010
  2. Don't create local vars.

    miloops authored and tenderlove committed Nov 20, 2010
  3. Avoid creating local var.

    miloops authored and tenderlove committed Nov 20, 2010
  4. Remove explicit return.

    miloops authored and tenderlove committed Nov 20, 2010