aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-05-20 18:16:03 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-05-20 18:16:03 -0300
commita78ee05da102b85f45ecc1a6f230817430fe2aea (patch)
tree8962e84b5d40a16f7f45b6b8f89f115afe31f9c4 /actionpack
parent46fcce9a55207b15c42b0b274a74d20e783b702f (diff)
downloadrails-a78ee05da102b85f45ecc1a6f230817430fe2aea.tar.gz
rails-a78ee05da102b85f45ecc1a6f230817430fe2aea.tar.bz2
rails-a78ee05da102b85f45ecc1a6f230817430fe2aea.zip
Fix CHANGELOG order and add a brief description of the changes in the
Action Pack in the upgrading guide. [ci skip]
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 94b3490b80..1e6e84ea4a 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,8 @@
## Rails 4.0.0 (unreleased) ##
+* `assert_generates`, `assert_recognizes`, and `assert_routing` all raise
+ `Assertion` instead of `RoutingError` *David Chelimsky*
+
* URL path parameters with invalid encoding now raise ActionController::BadRequest. *Andrew White*
* Malformed query and request parameter hashes now raise ActionController::BadRequest. *Andrew White*
@@ -190,9 +193,6 @@
* `ActionView::Helpers::TextHelper#highlight` now defaults to the
HTML5 `mark` element. *Brian Cardarella*
-* `assert_generates`, `assert_recognizes`, and `assert_routing` all raise
- `Assertion` instead of `RoutingError` *David Chelimsky*
-
## Rails 3.2.3 (March 30, 2012) ##