aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-02-06 18:59:15 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-02-06 19:02:40 -0200
commit2f0c26bf5913346311b75a3b100d2f79cfe8df3c (patch)
tree5617bd00a3dd23fe9f2fb37fa30884a37f474f73
parentc7598134a42406fc83d08cf44fa29fb46eeb2fe7 (diff)
downloadrails-2f0c26bf5913346311b75a3b100d2f79cfe8df3c.tar.gz
rails-2f0c26bf5913346311b75a3b100d2f79cfe8df3c.tar.bz2
rails-2f0c26bf5913346311b75a3b100d2f79cfe8df3c.zip
Update changelog from #9128 with author name
And improve AS changelog a bit [ci skip]
-rw-r--r--activesupport/CHANGELOG.md6
1 files changed, 4 insertions, 2 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index d4d03c7e40..fcfa5a5b81 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -5,6 +5,8 @@
the default behaviour of Date#toJSON() in recent versions of Chrome, Safari and
Firefox.
+ *James Harton*
+
* Improve `String#squish` to handle Unicode whitespace. *Antoine Lyset*
* Standardise on `to_time` returning an instance of `Time` in the local system timezone
@@ -19,8 +21,8 @@
*Yves Senn*
-* Hash.from_xml raises when it encounters type="symbol" or type="yaml".
- Use Hash.from_trusted_xml to parse this XML.
+* `Hash.from_xml` raises when it encounters `type="symbol"` or `type="yaml"`.
+ Use `Hash.from_trusted_xml` to parse this XML.
CVE-2013-0156