aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md9
1 files changed, 8 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 40c2399783..7e6a3df956 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,10 +1,17 @@
## Rails 3.2.10 (unreleased)
* Use `nil?` instead of `blank?` to check whether dynamic finder with a bang
- should raise RecordNotFound. Fixes #7238.
+ should raise RecordNotFound.
+ Fixes #7238.
*Nikita Afanasenko*
+* 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]