Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Dec 22, 2011
  1. @jonleighton
Commits on Dec 15, 2011
  1. @jonleighton
Commits on Nov 16, 2011
  1. @lazyatom

    `ActiveRecord::Base#becomes` should retain the errors of the original…

    lazyatom authored
    … object.
    
    This commit contains a simple failing test that demonstrates the behaviour we expect, and a fix. When using `becomes` to transform the type of an object, it should retain any error information that was present on the original instance.
Commits on Oct 5, 2011
  1. @jonleighton

    Revert "Raise error on unknown primary key."

    jonleighton authored
    This reverts commit ee2be43.
  2. @jonleighton

    Raise error on unknown primary key.

    jonleighton authored
    If we don't have a primary key when we ask for it, it's better to fail
    fast. Fixes GH #2307.
Commits on Sep 12, 2011
  1. @jonleighton

    Raise error when using write_attribute with a non-existent attribute.

    jonleighton authored
    Previously we would just silently write the attribute. This can lead to
    subtle bugs (for example, see the change in AutosaveAssociation where a
    through association would wrongly gain an attribute.
    
    Also, ensuring that we never gain any new attributes after
    initialization will allow me to reduce our dependence on method_missing.
Commits on Aug 8, 2011
  1. @jonleighton

    Make it the responsibility of the connection to hold onto an ARel vis…

    jonleighton authored
    …itor for generating SQL. This improves the code architecture generally, and solves some problems with marshalling. Adapter authors please take note: you now need to define an Adapter.visitor_for method, but it degrades gracefully with a deprecation warning for now.
Commits on Jul 24, 2011
  1. @jpkcambridge

    Fixed Typo

    John authored jpkcambridge committed
Commits on Jul 8, 2011
  1. @jonleighton

    Destroy association habtm record before destroying the record itself.…

    Tomas D'Stefano authored jonleighton committed
    … Fixes issue #402.
Commits on Jun 28, 2011
  1. @tenderlove
Commits on Jun 7, 2011
  1. @dmitriy-kiriyenko @jonleighton
Commits on May 25, 2011
  1. @fxn

    Merge branch 'master' of git://github.com/lifo/docrails

    fxn authored
    Conflicts:
    	actionmailer/lib/action_mailer/base.rb
    	activesupport/lib/active_support/core_ext/kernel/requires.rb
Commits on May 24, 2011
  1. @tenderlove
Commits on May 21, 2011
  1. @smartinez87
Commits on May 8, 2011
  1. @joshk
Commits on Apr 29, 2011
  1. @tenderlove
Commits on Apr 26, 2011
  1. @smartinez87
  2. @joshk
Commits on Mar 28, 2011
  1. @smartinez87 @spastorino

    Added new #update_column method.

    smartinez87 authored spastorino committed
    Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Commits on Mar 27, 2011
  1. @smartinez87 @spastorino

    Revert "Removed #update_attribute method. New #update_column method."

    smartinez87 authored spastorino committed
    This reverts commit 45c233e.
    
    Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Commits on Mar 26, 2011
  1. @smartinez87 @spastorino

    Removed #update_attribute method. New #update_column method.

    smartinez87 authored spastorino committed
    Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
Commits on Mar 22, 2011
  1. @tenderlove
Commits on Feb 15, 2011
  1. @miloops

    Merge remote branch 'rails/master' into identity_map

    miloops authored
    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 Feb 9, 2011
  1. @joshk

    removed some duplication from LH issue 5505 regarding AR touch and op…

    joshk authored Santiago Pastorino and José Ignacio Costa committed
    …timistic locking [#5505 state:resolved]
    
    Signed-off-by: Santiago Pastorino and José Ignacio Costa <santiago+jose@wyeworks.com>
  2. @franckverrot

    The optimistic lock column should be increased when calling touch

    franckverrot authored Santiago Pastorino and José Ignacio Costa committed
    Signed-off-by: Santiago Pastorino and José Ignacio Costa <santiago+jose@wyeworks.com>
Commits on Dec 29, 2010
  1. @spastorino
Commits on Dec 28, 2010
  1. @spastorino
Commits on Dec 20, 2010
  1. @miloops

    Merge remote branch 'rails/master' into identity_map

    miloops authored
    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 Dec 2, 2010
  1. @tenderlove
  2. @tenderlove
Commits on Nov 28, 2010
  1. @josevalim

    Partialy revert f1c13b0

    josevalim authored
Commits on Nov 19, 2010
  1. @miloops
  2. @swistak @miloops
Commits on Nov 11, 2010
  1. @franckverrot @josevalim
Commits on Nov 9, 2010
  1. @spastorino
Something went wrong with that request. Please try again.