Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge commit 'rails/3-0-unstable' | Yehuda Katz | 2009-01-30 | 1 | -2/+4 | |
| | | | | | | | | | | | | | 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 component | Joshua Peek | 2009-01-27 | 1 | -0/+166 | |