Yehuda Katz 3030bc90c9 Merge commit 'rails/3-0-unstable' ... 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		2009-01-30 11:30:27 -08:00
..
generation	Merge commit 'rails/3-0-unstable'	2009-01-30 11:30:27 -08:00
builder.rb	Added optimal formatted routes to rails, deprecating the formatted_* methods, and reducing routes creation by 50% [#1359 state:committed]	2008-11-26 10:52:05 +01:00
optimisations.rb	Added optimal formatted routes to rails, deprecating the formatted_* methods, and reducing routes creation by 50% [#1359 state:committed]	2008-11-26 10:52:05 +01:00
recognition_optimisation.rb	When checking for the wrong routing method, ensure the environment is passed to recognize optimize [#1406 state:resolved]	2008-12-17 10:20:19 -06:00
resources.rb	Reorganize ActionController folder structure	2009-01-27 18:17:39 -06:00
route.rb	Merge branch 'master' of git@github.com:rails/rails	2008-11-26 02:05:53 -08:00
route_set.rb	Move HTTP libs and middleware into ActionDispatch component	2009-01-27 18:54:01 -06:00
routing_ext.rb	Pare down object creation during route building	2008-11-10 22:21:09 -08:00
segments.rb	Added optimal formatted routes to rails, deprecating the formatted_* methods, and reducing routes creation by 50% [#1359 state:committed]	2008-11-26 10:52:05 +01:00