aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-23 06:58:10 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-23 06:58:10 -0700
commit030d30d64cd8d8e376f9db25a3fe3e11358731cf (patch)
tree6584d98b81430685a2cd57b507ea507dfa7ab884 /activerecord/CHANGELOG.md
parent9e5b8e3831552a103b2dcf8de75fb6a2337d42ba (diff)
parentef99c1147592e91bb256952986470592ea0e5f6c (diff)
downloadrails-030d30d64cd8d8e376f9db25a3fe3e11358731cf.tar.gz
rails-030d30d64cd8d8e376f9db25a3fe3e11358731cf.tar.bz2
rails-030d30d64cd8d8e376f9db25a3fe3e11358731cf.zip
Merge pull request #10713 from senny/10693_fix_primary_key_option_on_has_many
Fix the `:primary_key` option for `has_many` associations.
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 09ed2bdc0c..3efd473627 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,8 @@
+* Fix the `:primary_key` option for `has_many` associations.
+ Fixes #10693.
+
+ *Yves Senn*
+
* Fix bug where tiny types are incorectly coerced as booleand when the length is more than 1.
Fixes #10620.