aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-08-21 17:50:06 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2008-08-21 17:50:06 -0700
commitaab2f0b353d4d8d80605dda328ca3c28f680e2b1 (patch)
tree100a3192923dea387b59ef1b9364d3d940753b33 /actionpack/CHANGELOG
parent09343166ac213e5fcbd3eb5b21d44606b56afa62 (diff)
parent98fb161dbb13feb18165468aedf1581d5c2305f4 (diff)
downloadrails-aab2f0b353d4d8d80605dda328ca3c28f680e2b1.tar.gz
rails-aab2f0b353d4d8d80605dda328ca3c28f680e2b1.tar.bz2
rails-aab2f0b353d4d8d80605dda328ca3c28f680e2b1.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/CHANGELOG')
-rw-r--r--actionpack/CHANGELOG4
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index db3378d9d9..be490093ac 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,9 @@
*Edge*
+* Allow polymorphic_url helper to take url options. #880 [Tarmo Tänav]
+
+* Switched integration test runner to use Rack processor instead of CGI [Josh Peek]
+
* Made AbstractRequest.if_modified_sense return nil if the header could not be parsed [Jamis Buck]
* Added back ActionController::Base.allow_concurrency flag [Josh Peek]