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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Cleaning up and documenting AbstractController::Layouts	Yehuda Katz + Carl Lerche	2009-06-09	1	-5/+166
\|
*	AS::Concern redefines "include" to lazy include modules as dependencies	Joshua Peek	2009-05-29	1	-2/+2
\|
*	Break up DependencyModule's dual function of providing a "depend_on" DSL and ↵	Joshua Peek	2009-05-28	1	-1/+1
\| \| \| \|	"included" block DSL into separate modules. But, unify both approaches under AS::Concern.
*	Revert "Revert "Whitespace!""	Joshua Peek	2009-05-28	1	-20/+18
\| \| \|	This reverts commit 0cac68d3bed3e6bf8ec2eb994858e4a179046941.
*	Get controller/layout_test.rb running on new base except for ↵	Yehuda Katz + Carl Lerche	2009-05-22	1	-12/+9
\| \| \| \|	ActionController::Base.exempt_from_layout which is going to be deprecated.
*	Implemented redirects and partial rendering in new base.	Yehuda Katz + Carl Lerche	2009-05-12	1	-1/+1
\|
*	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
\| *	Revert "Whitespace!"	Yehuda Katz + Carl Lerche	2009-05-11	1	-6/+8
\| \| \| \| \| \| \| \|	This reverts commit a747ab5b20b9d543e9d311070e3b720c761ae716.
\| *	Whitespace!	Joshua Peek	2009-05-07	1	-8/+6
\| \|
\| *	Make module dependency DSL opt in	Joshua Peek	2009-05-07	1	-0/+2
\| \|
* \|	Get render :inline working	Yehuda Katz + Carl Lerche	2009-05-01	1	-1/+1
\|/
*	Rename render_to_string to render_to_body since it may return any ↵	Jeremy Kemper	2009-04-17	1	-2/+2
\| \| \| \|	Rack-compatible body, not just strings
*	Get Base2 layouts to work :)	Yehuda Katz and Carl Lerche	2009-04-07	1	-0/+23
\|
*	Add depends_on, use, and setup to abstract up ideas about module inheritance.	Yehuda Katz and Carl Lerche	2009-04-07	1	-0/+3
\|
*	Checkpoint	Yehuda Katz and Carl Lerche	2009-03-23	1	-26/+0
\|
*	Add a bunch of tests for various render :action, layout combinations	Yehuda Katz	2009-03-23	1	-4/+5
\|
*	Finished implementing layout for render :text	Carl Lerche	2009-03-23	1	-3/+20
\|
*	Get very basic layouts working.	Yehuda Katz	2009-03-19	1	-0/+19
	* Required small architecture change