diff options
Diffstat (limited to 'activerecord/CHANGELOG.md')
| -rw-r--r-- | activerecord/CHANGELOG.md | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 608e10f866..343c6cac15 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,5 +1,10 @@ ## Rails 3.2.14 (Jul 22, 2013) ## +* Fix merge error when Equality LHS is non-attribute. + Backport of #7380. + + *Karmes Alexander* + * Do not re-create destroyed association when saving the parent object. Fixes #11450. |