aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-11 18:47:15 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-11 18:49:36 -0300
commite2804c62dfdd1946a11048196ea32aae17a7edd5 (patch)
tree60f50d2f5fab99ee0d7a60d04427d0622a264787
parent0549ebea223beeb68c09ac9656579f02e893c0f7 (diff)
downloadrails-e2804c62dfdd1946a11048196ea32aae17a7edd5.tar.gz
rails-e2804c62dfdd1946a11048196ea32aae17a7edd5.tar.bz2
rails-e2804c62dfdd1946a11048196ea32aae17a7edd5.zip
Add CHANGELOG entry removed by mistake [ci skip]
-rw-r--r--activesupport/CHANGELOG.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 2cbdfb015b..7f2acb2f65 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -20,6 +20,13 @@
*Dan Kubb*
+* Remove surrogate unicode character encoding from ActiveSupport::JSON.encode
+ The encoding scheme was broken for unicode characters outside the basic
+ multilingual plane; since json is assumed to be UTF-8, and we already force the
+ encoding to UTF-8 simply pass through the un-encoded characters.
+
+ *Brett Carter*
+
* Fix mocha v0.13.0 compatibility. *James Mead*
* `#as_json` isolates options when encoding a hash. [Backport #8185]