diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2010-12-12 09:55:32 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2010-12-12 09:55:32 +0000 |
| commit | 9a98c766e045aebc2ef6d5b716936b73407f095d (patch) | |
| tree | 899834482c828f31a89ebc7bb6e19cbe0b5f18d3 /activerecord/CHANGELOG | |
| parent | 3a7f43ca6ecf1735e1a82d4a68ac8f62b5cf2fcf (diff) | |
| parent | 307443972c5f6de959a5401eec76ca327484b10c (diff) | |
| download | rails-9a98c766e045aebc2ef6d5b716936b73407f095d.tar.gz rails-9a98c766e045aebc2ef6d5b716936b73407f095d.tar.bz2 rails-9a98c766e045aebc2ef6d5b716936b73407f095d.zip | |
Merge branch 'master' into nested_has_many_through
Conflicts:
activerecord/CHANGELOG
activerecord/lib/active_record/associations/class_methods/join_dependency.rb
activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb
activerecord/lib/active_record/associations/has_many_through_association.rb
Diffstat (limited to 'activerecord/CHANGELOG')
| -rw-r--r-- | activerecord/CHANGELOG | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index 3f62cea5f5..2d9f4da79e 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,6 +1,11 @@ *Rails 3.1.0 (unreleased)* -* Associations with a :through option can now use *any* association as the through or source association, including other associations which have a :through option and has_and_belongs_to_many associations #1812 [Jon Leighton] +* Associations with a :through option can now use *any* association as the +through or source association, including other associations which have a +:through option and has_and_belongs_to_many associations #1812 [Jon Leighton] + +* Setting the id of a belongs_to object will update the reference to the +object. [#2989 state:resolved] * ActiveRecord::Base#dup and ActiveRecord::Base#clone semantics have changed to closer match normal Ruby dup and clone semantics. |