aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/CHANGELOG.md
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2013-12-04 09:54:19 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2013-12-04 09:54:19 -0800
commit033d770f25f63af5934da6f212eb0eda795b1360 (patch)
tree8a991d6e439e2e18404ac04e1023652dfd227bbf /actionview/CHANGELOG.md
parentef2ef5cb93a87b4631d7de085c235a4bf354a640 (diff)
parent0696547814057eaed3c13e70a6dc6b2b7bb3e1f9 (diff)
downloadrails-033d770f25f63af5934da6f212eb0eda795b1360.tar.gz
rails-033d770f25f63af5934da6f212eb0eda795b1360.tar.bz2
rails-033d770f25f63af5934da6f212eb0eda795b1360.zip
Merge pull request #13073 from chancancode/json_escape
Fixed json_escape (again)
Diffstat (limited to 'actionview/CHANGELOG.md')
-rw-r--r--actionview/CHANGELOG.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
index d53b321f97..9e58c193b1 100644
--- a/actionview/CHANGELOG.md
+++ b/actionview/CHANGELOG.md
@@ -1,3 +1,10 @@
+* Fixed a long-standing bug in `json_escape` that causes quotation marks to be stripped.
+ This method also escapes the \u2028 and \u2029 unicode newline characters which are
+ treated as \n in JavaScript. This matches the behaviour of the AS::JSON encoder. (The
+ original change in the encoder was introduced in #10534.)
+
+ *Godfrey Chan*
+
* `ActionView::MissingTemplate` includes underscore when raised for a partial.
Fixes #13002.