diff options
author | Nick Rogers <ncrogers@gmail.com> | 2012-03-07 17:16:21 -0500 |
---|---|---|
committer | Nick Rogers <ncrogers@gmail.com> | 2012-11-13 10:36:24 -0800 |
commit | 05e1466e059a12bddd066a9f22ca575d81cfc21d (patch) | |
tree | 5bb201db68f6a8d422169e40fb6976f6264e0855 /activerecord/CHANGELOG.md | |
parent | 5ed0381db5e6dff1269f3f22ec4fa69c203c37d9 (diff) | |
download | rails-05e1466e059a12bddd066a9f22ca575d81cfc21d.tar.gz rails-05e1466e059a12bddd066a9f22ca575d81cfc21d.tar.bz2 rails-05e1466e059a12bddd066a9f22ca575d81cfc21d.zip |
Fix deleting from a HABTM join table upon destroying an object of a model with optimistic locking enabled. Fixes #5332.
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r-- | activerecord/CHANGELOG.md | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 36f628ee43..b918bf66b3 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,5 +1,9 @@ ## Rails 3.2.10 (unreleased) +* Fix deleting from a HABTM join table upon destroying an object of a model with optimistic locking enabled. Fixes #5332. + + *Nick Rogers* + * Use query cache/uncache when using ENV["DATABASE_URL"]. Fixes #6951. [Backport #8074] |