aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-03-07 20:15:49 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2013-03-07 20:15:49 -0300
commita04963138092d11ce49ff1e01c68366c875863a1 (patch)
tree822f2b92e68d378d0db8eb80da0f2d6ec9a7a7b2 /actionpack
parentde4a60c9f468bb5bf4bd38220377cc5ac8385102 (diff)
downloadrails-a04963138092d11ce49ff1e01c68366c875863a1.tar.gz
rails-a04963138092d11ce49ff1e01c68366c875863a1.tar.bz2
rails-a04963138092d11ce49ff1e01c68366c875863a1.zip
Move AP changelog entry to the top [ci skip]
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG.md12
1 files changed, 6 insertions, 6 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 8f7236c596..1050626884 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,11 @@
## Rails 4.0.0 (unreleased) ##
+* Fixed regression when using `assert_template` to verify files sent using
+ `render file: 'README.md'`.
+ Fixes #9464.
+
+ *Justin Coyne*
+
* Fixed `ActionView::Helpers::CaptureHelper#content_for` regression when trying to use it in
a boolean statement.
Fixes #9360.
@@ -16,12 +22,6 @@
*Yves Senn*
-* Fixed regression when using `assert_template` to verify files sent using
- `render file: 'README.md'`.
- Fixes #9464.
-
- *Justin Coyne*
-
* Skip valid encoding checks for non-String parameters that come
from the matched route's defaults.
Fixes #9435.