rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Implemented redirects and partial rendering in new base.	Yehuda Katz + Carl Lerche	2009-05-12	1	-12/+30
\|
*	Merge branch 'master' into wip_abstract_controller	Yehuda Katz + Carl Lerche	2009-05-11	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: actionpack/lib/action_controller/abstract/callbacks.rb actionpack/lib/action_controller/abstract/renderer.rb actionpack/lib/action_controller/base/base.rb actionpack/lib/action_controller/dispatch/dispatcher.rb actionpack/lib/action_controller/routing/route_set.rb actionpack/lib/action_controller/testing/process.rb actionpack/test/abstract_controller/layouts_test.rb actionpack/test/controller/filters_test.rb actionpack/test/controller/helper_test.rb actionpack/test/controller/render_test.rb actionpack/test/new_base/test_helper.rb
*	Fixed a bug with handling render options	Yehuda Katz + Carl Lerche	2009-05-11	1	-0/+9
\|
*	Aliased AbstractController::ActionNotFound to ActionController::UnknownAction	Yehuda Katz + Carl Lerche	2009-05-11	1	-5/+8
\|
*	Ported ConditionalGet to new Base	Yehuda Katz + Carl Lerche	2009-05-11	1	-0/+3
\|
*	Renamed Base2 to Base and don't require old action_controller for new Base	Yehuda Katz + Carl Lerche	2009-05-01	1	-0/+21
\|
*	Add support for stripping "layouts/" from the layout name	Yehuda Katz + Carl Lerche	2009-05-01	1	-0/+5
\|
*	OMG, a lot of work	Yehuda Katz + Carl Lerche	2009-05-01	1	-0/+12