From ff48edd442a9727a1931e6127d29340f903a1e2a Mon Sep 17 00:00:00 2001 From: Prem Sichanugrist Date: Fri, 10 Jun 2011 18:29:52 -0400 Subject: [PATCH] Update CHANGELOG to mention the json_escape change --- actionpack/CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index ac71a397b6..5f9c8a93dd 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *Rails 3.1.0 (unreleased)* +* json_escape will now return a SafeBuffer string if it receives SafeBuffer string [tenderlove] + * Make sure escape_js returns SafeBuffer string if it receives SafeBuffer string [Prem Sichanugrist] * Fix escape_js to work correctly with the new SafeBuffer restriction [Paul Gallagher]