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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge abstract_controller/test_helper and new_base/test_helper since they ↵	Joshua Peek	2009-09-13	1	-24/+0
\| \| \| \|	are expected to run in the same testing sandbox
*	Need to declare optional dependencies from AS	Joshua Peek	2009-09-13	1	-0/+3
\|
*	Move AbstractController to a top-level component	Yehuda Katz	2009-08-06	1	-1/+1
\|
*	Cherry-pick core extensions	Jeremy Kemper	2009-05-13	1	-2/+2
\|
*	Merge branch 'master' into wip_abstract_controller	Yehuda Katz + Carl Lerche	2009-05-11	1	-0/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \|	Renamed Base2 to Base and don't require old action_controller for new Base	Yehuda Katz + Carl Lerche	2009-05-01	1	-11/+2
\| \|
* \|	Starting to get new_base to run on old tests	Yehuda Katz + Carl Lerche	2009-05-01	1	-2/+5
\|/
*	Checkpoint	Yehuda Katz and Carl Lerche	2009-03-23	1	-0/+2
\|
*	Move Abstract stuff to autoload	Yehuda Katz	2009-03-12	1	-5/+6
\|
*	Helpers with an initial test	Yehuda Katz	2009-03-03	1	-0/+22