aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorZachary Scott <e@zzak.io>2014-05-23 14:45:21 -0700
committerZachary Scott <e@zzak.io>2014-05-23 14:45:21 -0700
commit1d7b3fa84caec0e935df3b61573a5ef23ea69f34 (patch)
tree3dc511017e28d13164e8da80fc3ec340aab6e212 /activerecord
parent482091ca7c54ea6d3dc336cf90543968c16b1e7f (diff)
downloadrails-1d7b3fa84caec0e935df3b61573a5ef23ea69f34.tar.gz
rails-1d7b3fa84caec0e935df3b61573a5ef23ea69f34.tar.bz2
rails-1d7b3fa84caec0e935df3b61573a5ef23ea69f34.zip
Future port c8ddb61
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG.md19
1 files changed, 10 insertions, 9 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 260bd063aa..041872034f 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -28,7 +28,8 @@
*Brock Trappitt*
-* Fixed the inferred table name of a HABTM auxiliar table inside a schema.
+* Fixed the inferred table name of a has_and_belongs_to_many auxiliar
+ table inside a schema.
Fixes #14824
@@ -71,7 +72,7 @@
*Aaron Nelson*
-* Fix how to calculate associated class name when using namespaced `has_and_belongs_to_many`
+* Fix how to calculate associated class name when using namespaced has_and_belongs_to_many
association.
Fixes #14709.
@@ -124,7 +125,7 @@
*Innokenty Mikhailov*
-* Allow the PostgreSQL adapter to handle bigserial pk types again.
+* Allow the PostgreSQL adapter to handle bigserial primary key types again.
Fixes #10410.
@@ -139,10 +140,10 @@
*Yves Senn*
-* Fixed HABTM's CollectionAssociation size calculation.
+* Fixed has_and_belongs_to_many's CollectionAssociation size calculation.
- HABTM should fall back to using the normal CollectionAssociation's size
- calculation if the collection is not cached or loaded.
+ has_and_belongs_to_many should fall back to using the normal CollectionAssociation's
+ size calculation if the collection is not cached or loaded.
Fixes #14913, #14914.
@@ -186,10 +187,10 @@
*Eric Chahin*, *Aaron Nelson*, *Kevin Casey*
-* Stringify all variable keys of mysql connection configuration.
+* Stringify all variables keys of MySQL connection configuration.
- When the `sql_mode` variable for mysql adapters is set in the configuration
- as a `String`, it was ignored and overwritten by the strict mode option.
+ When `sql_mode` variable for MySQL adapters set in configuration as `String`
+ was ignored and overwritten by strict mode option.
Fixes #14895.