Skip to content
Commits on Oct 10, 2013
  1. @rafaelfranca

    Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build"

    rafaelfranca committed
    This reverts commit ccd11d5, reversing
    changes made to 54c05ac.
    
    Reason: This caused a regression when the associated record is created
    in a before_create callback. See
    #12413 (comment)
Commits on Sep 30, 2013
  1. @arthurnn
Commits on Mar 7, 2013
  1. @larrylv

    @target might be nil when Identity Map is enabled.

    larrylv committed
    * With Identity Map enabled, NameError might be raised and @target is
      nil. So we should always ensure `@target ||= find_target`.
    
    * Only force reload target when it is stale.
Commits on Mar 5, 2013
  1. @larrylv

    Fix issue #7526. Reload the target if it's stale.

    larrylv committed
    * This has been fixed at master via `365b8b6`, but not at 3-2-stable branch.
    
    * @stale_state should be nil when a model isn't saved. via `0f3901e`.
    
    * set @stale_state to nil when reset the target.
Commits on Nov 22, 2012
  1. @senny

    backport #8291, prevent mass assignment of polymorphic type with `build`

    senny committed
    Closes #8265
    
    Conflicts:
    
    	activerecord/CHANGELOG.md
    	activerecord/lib/active_record/associations/association.rb
Commits on Mar 5, 2012
  1. @byroot @tenderlove
Commits on Dec 21, 2011
  1. @qoobaa @josevalim

    added failing tests for has_many, has_one and belongs_to associations…

    qoobaa committed with josevalim
    … with strict mass assignment sanitizer, fixed build_record to not merge creation_attributes, removed failing nested attributes tests (that feature was broken anyway) #4051
    
    Signed-off-by: José Valim <jose.valim@gmail.com>
Commits on Dec 15, 2011
  1. @akaspick

    Allow nested attributes in associations to update values in it's owne…

    akaspick committed
    …r object. Fixes a regression from 3.0.x
Commits on Aug 15, 2011
  1. @jonleighton

    Fix private methods which are delegated to. This previously worked be…

    jonleighton committed
    …cause Module#delegate previously ignored method visibility.
Commits on Jul 7, 2011
  1. @jonleighton

    Don't construct association scope in initializer. This yields a big p…

    jonleighton committed
    …erformance gain for cases where the association is never used to load the target, for example with preloading. Related: #1873.
Commits on Jun 30, 2011
  1. @jonleighton

    Assign the association attributes to the associated record before the…

    jonleighton committed
    … before_initialize callback of the record runs. Fixes #1842.
Commits on Jun 7, 2011
  1. @jonleighton

    Allow polymorphic has_one to work when the association is set before …

    jonleighton committed
    …the owner has been saved. Fixes #1524.
  2. @jonleighton

    When you add a record to a polymorphic has_one, you should be able to…

    jonleighton committed
    … access the owner from the associated record
Commits on Apr 13, 2011
  1. @sikachu @dhh

    Remove `#among?` from Active Support

    sikachu committed with dhh
    After a long list of discussion about the performance problem from using varargs and the reason that we can't find a great pair for it, it would be best to remove support for it for now.
    
    It will come back if we can find a good pair for it. For now, Bon Voyage, `#among?`.
Commits on Apr 11, 2011
  1. @dhh
Commits on Apr 10, 2011
  1. @sikachu @dhh

    Using Object#in? and Object#either? in various places

    sikachu committed with dhh
    There're a lot of places in Rails source code which make a lot of sense to switching to Object#in? or Object#either? instead of using [].include?.
Commits on Mar 10, 2011
  1. @jonleighton

    Move the code which builds a scope for through associations into a ge…

    jonleighton committed
    …neric AssociationScope class which is capable of building a scope for any association.
Commits on Mar 5, 2011
  1. @rtlechow @fxn

    Active Record typos.

    rtlechow committed with fxn
Commits on Mar 4, 2011
  1. @jonleighton @tenderlove

    Fix a couple of tests in join_model_test.rb which were failing when t…

    jonleighton committed with tenderlove
    …he identity map is turned off
Commits on Feb 21, 2011
  1. @jonleighton @tenderlove
  2. @jonleighton @tenderlove

    Delegate Association#options to the reflection, and replace 'reflecti…

    jonleighton committed with tenderlove
    …on.options' with 'options'. Also add through_options and source_options methods for through associations.
  3. @jonleighton @tenderlove

    Associations - where possible, call attributes methods rather than di…

    jonleighton committed with tenderlove
    …rectly accessing the instance variables
Commits on Feb 18, 2011
  1. @miloops
  2. @miloops
  3. @miloops

    Merge remote branch 'rails/master' into identity_map

    miloops committed
    Conflicts:
    	activerecord/lib/active_record/associations/association.rb
    	activerecord/lib/active_record/fixtures.rb
  4. @jonleighton

    Split AssociationProxy into an Association class (and subclasses) whi…

    jonleighton committed
    …ch manages the association, and a CollectionProxy class which is *only* a proxy. Singular associations no longer have a proxy. See CHANGELOG for more.
Something went wrong with that request. Please try again.