From b00b638b95dc513f4ba854ba3a96b7a8f344e4cc Mon Sep 17 00:00:00 2001
From: Lucas Mazza <lucastmazza@gmail.com>
Date: Wed, 2 Jul 2014 18:48:04 -0300
Subject: Change the JSON renderer to enforce the 'JS' Content Type

The controller can set the response format as 'JSON' before the renderer code be
evaluated, so we must replace it when necessary.

Fixes #15081
---
 actionpack/CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'actionpack/CHANGELOG.md')

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index cc72aa3081..c8ea4052f6 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,10 @@
+*   JSONP responses are now rendered with the `text/javascript` content type
+    when rendering through a `respond_to` block.
+
+    Fixes #15081.
+
+    *Lucas Mazza*
+
 *   Add `config.action_controller.always_permitted_parameters` to configure which
     parameters are permitted globally. The default value of this configuration is
     `['controller', 'action']`.
-- 
cgit v1.2.3