aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG.md
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/CHANGELOG.md')
-rw-r--r--actionpack/CHANGELOG.md10
1 files changed, 10 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 2a9afed35b..27ada73785 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,15 @@
## Rails 4.0.0 (unreleased) ##
+* `format: true` does not override existing format constraints.
+ Fixes #9466.
+
+ Example:
+
+ # this will force the .json extension
+ get '/json_only', to: ok, format: true, constraints: { format: /json/ }
+
+ *Yves Senn*
+
* Skip valid encoding checks for non-String parameters that come
from the matched route's defaults.
Fixes #9435.