Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Some merge cleanup | Yehuda Katz | 2009-02-02 | 2 | -2/+2 |
| | |||||
* | Merge commit 'rails/3-0-unstable' | Yehuda Katz | 2009-01-30 | 2 | -40/+40 |
| | | | | | | | | | | | | | 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 dispatch related tests into test/dispatch | Joshua Peek | 2009-01-28 | 10 | -0/+1572 |