Permalink
Browse files

Merge pull request #15289 from zzak/future_port_c8ddb61

Future port c8ddb61 [ci skip]
  • Loading branch information...
2 parents 6d48d97 + 1d7b3fa commit 3bc684bf04d252098a6be248876a9548da25c558 @chancancode chancancode committed May 23, 2014
Showing with 14 additions and 14 deletions.
  1. +3 −3 actionpack/CHANGELOG.md
  2. +10 −9 activerecord/CHANGELOG.md
  3. +1 −2 railties/CHANGELOG.md
View
@@ -3,7 +3,7 @@
*Guo Xiang Tan*
-* Fix 'Stack level too deep' when rendering `head :ok` in an action method
+* Fix `'Stack level too deep'` when rendering `head :ok` in an action method
called 'status' in a controller.
Fixes #13905.
@@ -71,7 +71,7 @@
4. Use `escape_segment` rather than `escape_path` in URL generation
For point 4 there are two exceptions. Firstly, when a route uses wildcard segments
- (e.g. *foo) then we use `escape_path` as the value may contain '/' characters. This
+ (e.g. `*foo`) then we use `escape_path` as the value may contain '/' characters. This
means that wildcard routes can't be optimized. Secondly, if a `:controller` segment
is used in the path then this uses `escape_path` as the controller may be namespaced.
@@ -101,7 +101,7 @@
*Andrew White*, *James Coglan*
-* Append link to bad code to backtrace when exception is SyntaxError.
+* Append link to bad code to backtrace when exception is `SyntaxError`.
*Boris Kuznetsov*
View
@@ -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.
View
@@ -2,8 +2,7 @@
*Dan Kang*
-* Load database configuration from the first
- database.yml available in paths.
+* Load database configuration from the first `database.yml` available in paths.
*Pier-Olivier Thibault*

0 comments on commit 3bc684b

Please sign in to comment.