diff options
| author | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2014-04-22 17:20:52 -0500 |
|---|---|---|
| committer | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2014-04-22 17:20:52 -0500 |
| commit | c26a690b9964d90eea33f33a513ae9c349678cc0 (patch) | |
| tree | 202768bd10efa7f1ad8395f324ba0e95f2b6ffc0 /activerecord/CHANGELOG.md | |
| parent | 148d909380cf9b85a51875a6790a6d69a2d0d693 (diff) | |
| parent | 47a04b8bbf35238639b00bfab500a84607d8d871 (diff) | |
| download | rails-c26a690b9964d90eea33f33a513ae9c349678cc0.tar.gz rails-c26a690b9964d90eea33f33a513ae9c349678cc0.tar.bz2 rails-c26a690b9964d90eea33f33a513ae9c349678cc0.zip | |
Merge pull request #14573 from habermann24/has_many_through_fix
Properly handle scoping with has_many :through. Fixes #14537.
Conflicts:
activerecord/CHANGELOG.md
activerecord/test/cases/associations/has_many_through_associations_test.rb
Diffstat (limited to 'activerecord/CHANGELOG.md')
| -rw-r--r-- | activerecord/CHANGELOG.md | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 74f5666de0..9138230b5e 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,12 @@ +* Fixed unexpected behavior for `has_many :through` associations going through a scoped `has_many`. + + If a `has_many` association is adjusted using a scope, and another `has_many :through` + uses this association, then the scope adjustment is unexpectedly neglected. + + Fixes #14537. + + *Jan Habermann* + * `@destroyed` should always be set to `false` when an object is duped. *Kuldeep Aggarwal* |