aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/CHANGELOG')
-rw-r--r--activerecord/CHANGELOG2
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index da4e0a59d2..5d437a3e70 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Deprecation: count class method should be called with an options hash rather than two args for conditions and joins. #6287 [Bob Silva]
+
* has_one associations with a nil target may be safely marshaled. #6279 [norbauer, Jeremy Kemper]
* Duplicate the hash provided to AR::Base#to_xml to prevent unexpected side effects [Koz]