diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-02 15:28:59 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-02 15:28:59 -0700 |
commit | 7a38eae0075b4f38462be267fa80a4ff366fdd00 (patch) | |
tree | 60090e23ea084c1446cdeae5d56b06a9fb611b4e /activerecord/lib/active_record/associations/collection_proxy.rb | |
parent | 0091808a081e85d4f44631984fa8a54ddf345868 (diff) | |
parent | b86a4965b8532286430b7cd9b359a2574d745b92 (diff) | |
download | rails-7a38eae0075b4f38462be267fa80a4ff366fdd00.tar.gz rails-7a38eae0075b4f38462be267fa80a4ff366fdd00.tar.bz2 rails-7a38eae0075b4f38462be267fa80a4ff366fdd00.zip |
Merge branch 'master' into habtm
* master:
we can define callbacks without a builder instance
push methods that don't depend on the instance to the class
get the name from the reflection
cache the name and options on the stack
decouple belongs_to callback definition from the builder instance.
add_before_destroy_callbacks doesn't depend on the instance, so push it to the class.
valid_options doesn't depend on the instance, so push it to the class
use the information on the reflection to determine whether callbacks should be added
Running all isolated test for actionview
association builder is no longer needed for counter cache, so remove it
push constructable? on to the reflection
Adds the Rails maintenance policy to the Guides
name is on the reflection, so just use the reflection
decouple define_callback from the instance
Added activemodel as a explicit dependency
unify `Fixes` notes in AR changelog. [ci skip].
improving `reload` doc wording. #12418 [ci skip]
Update AR reload doc for the case of manually set primary key attribute [ci skip]
Diffstat (limited to 'activerecord/lib/active_record/associations/collection_proxy.rb')
0 files changed, 0 insertions, 0 deletions