aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-07-02 20:23:42 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-07-02 20:23:42 -0300
commitbeab403fc31199bbb01f1e6e1ba0f839af047afe (patch)
treee1bb44ddb80a2a5259f968a1ee3a7b78edbf6ef1 /actionpack/CHANGELOG.md
parentf2fc31473f0b0e7c8fe39156413b626358131543 (diff)
parentb00b638b95dc513f4ba854ba3a96b7a8f344e4cc (diff)
downloadrails-beab403fc31199bbb01f1e6e1ba0f839af047afe.tar.gz
rails-beab403fc31199bbb01f1e6e1ba0f839af047afe.tar.bz2
rails-beab403fc31199bbb01f1e6e1ba0f839af047afe.zip
Merge pull request #16026 from lucasmazza/lm-respond-to-jsonp-fix
Change the JSON renderer to enforce the 'JS' Content Type
Diffstat (limited to 'actionpack/CHANGELOG.md')
-rw-r--r--actionpack/CHANGELOG.md7
1 files changed, 7 insertions, 0 deletions
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']`.