aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/routing/generation
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'rails/3-0-unstable'Yehuda Katz2009-01-301-6/+3
| | | | | | | | | | | | | 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
* Reorganize ActionController folder structureJoshua Peek2009-01-272-0/+420