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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Break up DependencyModule's dual function of providing a "depend_on" DSL and ↵	Joshua Peek	2009-05-28	1	-11/+1
\| \| \| \|	"included" block DSL into separate modules. But, unify both approaches under AS::Concern.
*	Allow Module#depends_on to accept multiple modules	Pratik Naik	2009-05-21	1	-4/+6
\|
*	Merge branch 'master' into wip_abstract_controller	Yehuda Katz + Carl Lerche	2009-05-11	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
*	Prefer "included" language over "setup"	Joshua Peek	2009-05-07	1	-7/+7
\|
*	Make module dependency DSL opt in	Joshua Peek	2009-05-07	1	-0/+24