aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge commit 'rails/3-0-unstable'Yehuda Katz2009-02-021-1/+0
|\
| * Remove dead cgi_ext requireJeremy Kemper2009-01-311-1/+0
| |
* | Some merge cleanupYehuda Katz2009-02-021-10/+11
| |
* | Merge commit 'rails/3-0-unstable'Yehuda Katz2009-01-304-28/+19
|/ | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/base.rb actionpack/lib/action_dispatch/http/mime_type.rb actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_view/base.rb actionpack/lib/action_view/paths.rb actionpack/test/controller/session/cookie_store_test.rb actionpack/test/dispatch/rack_test.rb actionpack/test/dispatch/request_test.rb
* Move HTTP libs and middleware into ActionDispatch componentJoshua Peek2009-01-2719-0/+2065