aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-05-06 12:11:40 +0300
committerJosé Valim <jose.valim@gmail.com>2012-05-06 12:11:40 +0300
commitc02846ff52457b19c5cdd6f67eb7086cb887e136 (patch)
tree089a2bf1b1c4e066f7c70eb0497234702fd83bb5 /actionpack
parent13811eef778d45469c81e69aaf04fb76d39fae22 (diff)
downloadrails-c02846ff52457b19c5cdd6f67eb7086cb887e136.tar.gz
rails-c02846ff52457b19c5cdd6f67eb7086cb887e136.tar.bz2
rails-c02846ff52457b19c5cdd6f67eb7086cb887e136.zip
Update actionpack/CHANGELOG.md
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG.md6
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 96dee33f7b..b819f2e613 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,9 @@
## Rails 4.0.0 (unreleased) ##
+* `respond_to` and `respond_with` now raise ActionController::UnknownFormat instead
+ of directly returning head 406. The exception is rescued and converted to 406
+ in the exception handling middleware. *Steven Soroka*
+
* Allows `assert_redirected_to` to match against a regular expression. *Andy Lindeman*
* Add backtrace to development routing error page. *Richard Schneeman*
@@ -12,7 +16,7 @@
* Make current object and counter (when it applies) variables accessible when
rendering templates with :object / :collection. *Carlos Antonio da Silva*
-* JSONP now uses mimetype application/javascript instead of application/json *omjokine*
+* JSONP now uses mimetype application/javascript instead of application/json. *omjokine*
* Allow to lazy load `default_form_builder` by passing a `String` instead of a constant. *Piotr Sarnacki*