diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-13 11:06:40 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-13 11:06:40 -0800 |
| commit | aac032073de638d3fcad5d878ae7d42354c9cee8 (patch) | |
| tree | 5bb201db68f6a8d422169e40fb6976f6264e0855 /activerecord/CHANGELOG.md | |
| parent | 5ed0381db5e6dff1269f3f22ec4fa69c203c37d9 (diff) | |
| parent | 05e1466e059a12bddd066a9f22ca575d81cfc21d (diff) | |
| download | rails-aac032073de638d3fcad5d878ae7d42354c9cee8.tar.gz rails-aac032073de638d3fcad5d878ae7d42354c9cee8.tar.bz2 rails-aac032073de638d3fcad5d878ae7d42354c9cee8.zip | |
Merge pull request #8188 from courtland/habtm-fix-stable
Fix deleting from a HABTM join table upon destroying an object of a mode...
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] |