aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorDave Desrochers <dave726@gmail.com>2012-02-28 10:20:27 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-08-21 14:10:11 -0300
commitff0d9b93b9074c479dd6de657c71812f0ac40cbe (patch)
treedfad842195953c034096ef46e8d0c305f37499aa /activerecord/CHANGELOG.md
parentce0dd56183d198739638c2cfa7c17f90513a7072 (diff)
downloadrails-ff0d9b93b9074c479dd6de657c71812f0ac40cbe.tar.gz
rails-ff0d9b93b9074c479dd6de657c71812f0ac40cbe.tar.bz2
rails-ff0d9b93b9074c479dd6de657c71812f0ac40cbe.zip
reset_counters() was crashing when there were multiple belongs_to associations with the same foreign key.
This closes #5200.
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index da31da3269..c5ef39b9d2 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,11 @@
## Rails 4.0.0 (unreleased) ##
+* Fix `reset_counters` when there are multiple `belongs_to` association with the
+ same foreign key and one of them have a counter cache.
+ Fixes #5200.
+
+ *Dave Desrochers*
+
* `serialized_attributes` and `_attr_readonly` become class method only. Instance reader methods are deprecated.
*kennyj*