aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-09-17 10:48:58 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-09-17 10:49:28 -0300
commitc35a7d78ec2599b597296dc6749ca3d7ac434177 (patch)
treeb154e9b5f18c75479daa95b2817331068f31d52f /activerecord
parent82d507b4c37ff3a770a0c90424d73e967328094c (diff)
downloadrails-c35a7d78ec2599b597296dc6749ca3d7ac434177.tar.gz
rails-c35a7d78ec2599b597296dc6749ca3d7ac434177.tar.bz2
rails-c35a7d78ec2599b597296dc6749ca3d7ac434177.zip
Use the CHANGELOG convention [ci skip]
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG.md8
1 files changed, 5 insertions, 3 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index b344d5c804..1f83c09d44 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,12 +1,14 @@
## Rails 4.0.0 (unreleased) ##
-* Fix creation of through association models when using collection=[]
- on a hm:t association from an unsaved model.
+* Fix creation of through association models when using `collection=[]`
+ on a `has_many :through` association from an unsaved model.
+ Fix #7661.
*Ernie Miller*
* Explain only normal CRUD sql (select / update / insert / delete).
- Fix problem that explains unexplainable sql. Closes #7544 #6458.
+ Fix problem that explains unexplainable sql.
+ Closes #7544 #6458.
*kennyj*