diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-23 05:29:17 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-07-23 05:29:17 -0700 |
| commit | c4b93f57e1c29d6e1726d23d6ac2fdb75af9bdab (patch) | |
| tree | 7fdbeebaac918d4cef96f2b294697e2c2cf850db /activerecord/CHANGELOG.md | |
| parent | e0db277be0a57386d299fc0a231b585a612eb9ba (diff) | |
| parent | b289519f4ff7829271674d66d3196e1ee23056b6 (diff) | |
| download | rails-c4b93f57e1c29d6e1726d23d6ac2fdb75af9bdab.tar.gz rails-c4b93f57e1c29d6e1726d23d6ac2fdb75af9bdab.tar.bz2 rails-c4b93f57e1c29d6e1726d23d6ac2fdb75af9bdab.zip | |
Merge pull request #11563 from 90yukke/fix-nomethoderror-on-non-attribute-equalities
Fix merge error when Equality LHS is non-attribute.
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. |