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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'upstream/master'	Olli Jokinen	2011-12-01	100	-961/+1695
\|\
\| *	Leave default_asset_host_protocol unset	Jonathan del Strother	2011-12-01	1	-2/+0
\| *	minor typo fix	Vijay Dev	2011-12-01	1	-1/+1
\| *	fix exception page when template contains utf-8 and parameters contain utf-8	lest	2011-11-30	1	-1/+5
\| *	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-11-30	2	-7/+7
\| \|\
\| \| *	Fixing incorrect documentation	Aviv Ben-Yosef	2011-11-30	1	-2/+2
\| \| *	Fix ActionDispatch::Request method explanations	Travis Pew	2011-11-28	1	-5/+5
\| * \|	Log 'Filter chain halted as CALLBACKNAME rendered or redirected' every time a...	José Valim	2011-11-30	2	-1/+10
\| * \|	Fixes for using action view template in isolation.	José Valim	2011-11-30	3	-2/+12
\| * \|	Handle correctly optional parameters for callable asset_host.	Marc-Andre Lafortune	2011-11-29	1	-2/+2
\| * \|	put backtrace_cleaner to env	lest	2011-11-28	1	-13/+13
\| * \|	Revert "use any? to check for size"	Vijay Dev	2011-11-28	1	-1/+1
\| * \|	add namespace options to form_for	Vasiliy Ermolovich	2011-11-27	1	-2/+9
\| * \|	fix label with block in erb	lest	2011-11-27	1	-2/+2
\| \|/
\| *	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-11-26	2	-3/+3
\| \|\
\| \| *	use any? to check for size	Vijay Dev	2011-11-26	1	-1/+1
\| \| *	what's -> that's	Uģis Ozols	2011-11-25	1	-1/+1
\| \| *	Remove unnecessary comment.	Uģis Ozols	2011-11-25	1	-1/+1
\| \| *	- Avoid using .first since it will create an additional query.	Marc Chung	2011-11-22	1	-1/+1
\| * \|	removes a Serialization constant left in the previous revert	Xavier Noria	2011-11-25	1	-1/+0
\| * \|	Revert the serializers API as other alternatives are now also under discussion	José Valim	2011-11-25	2	-52/+0
\| * \|	Merge pull request #3747 from lest/middleware-logger	José Valim	2011-11-25	2	-9/+13
\| \|\ \
\| \| * \|	middlewares should use logger from env	lest	2011-11-25	2	-9/+13
\| * \| \|	Merge branch 'serializers'	José Valim	2011-11-25	4	-11/+62
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
\| \| * \|	Add docs to serializers. Update CHANGELOGs.	José Valim	2011-11-25	1	-0/+23
\| \| * \|	Rely solely on active_model_serializer and remove the fancy constant lookup.	José Valim	2011-11-23	1	-1/+3
\| \| * \|	Merge branch 'master' into serializers	José Valim	2011-11-23	40	-263/+511
\| \| \|\ \
\| \| * \| \|	Refactor to make renderers a Set	Jose and Yehuda	2011-10-15	1	-11/+9
\| \| * \| \|	Initial commit of serializer support	Jose and Yehuda	2011-10-15	3	-0/+28
\| * \| \| \|	configuration option to always write cookie	lest	2011-11-23	2	-2/+7
\| \| \|/ / \| \|/\| \|
\| * \| \|	Rely on a public contract between railties instead of accessing railtie metho...	José Valim	2011-11-23	2	-5/+6
\| * \| \|	Remove unreachable code, and add additional testcases.	kennyj	2011-11-24	1	-6/+1
\| * \| \|	Merge pull request #3724 from marcandre/media_default	Yehuda Katz	2011-11-22	1	-0/+3
\| \|\ \ \
\| \| * \| \|	Make explicit the default media when calling stylesheet_tag and change the de...	Marc-Andre Lafortune	2011-11-22	1	-0/+3
\| * \| \| \|	Merge pull request #3718 from lest/fix-javascript-include-tag	José Valim	2011-11-22	1	-1/+1
\| \|\ \ \ \
\| \| * \| \| \|	javascript_include_tag should add '.js' to sources that contain '.'	lest	2011-11-22	1	-1/+1
\| * \| \| \| \|	deprecation warning, changelog entry	lest	2011-11-22	1	-1/+3
\| * \| \| \| \|	move show_detailed_exceptions? to Rescue module	lest	2011-11-22	3	-5/+12
\| * \| \| \| \|	add ActionController::Metal#show_detailed_exceptions?	lest	2011-11-22	2	-9/+12
\| \|/ / / /
\| * \| \| \|	Revert "copy options keys to the right place so that undo will work correctly"	Aaron Patterson	2011-11-19	1	-4/+10
\| * \| \| \|	Merge pull request #3695 from tobiassvn/partial_path_error	Yehuda Katz	2011-11-19	1	-2/+7
\| \|\ \ \ \
\| \| * \| \| \|	Meaningful errors for unexpected partial arguments. Fixes #3573	Tobias Svensson	2011-11-19	1	-2/+7
\| * \| \| \| \|	Don't html-escape the :count option to translate if it's a Numeric. Fixes #3685.	Jon Leighton	2011-11-19	1	-1/+3
\| \|/ / / /
\| * \| \| \|	Warning removed for shadowing variable	Arun Agrawal	2011-11-19	1	-1/+1
\| * \| \| \|	Revert "make sure to require the right deprecation warning file"	Aaron Patterson	2011-11-18	1	-1/+0
\| * \| \| \|	Refactoring the redirect method for the router api.	Aaron Patterson	2011-11-18	1	-25/+19
\| * \| \| \|	moving redirection to objects	Aaron Patterson	2011-11-18	1	-45/+58
\| * \| \| \|	remove the :path feature to redirects, since it cannot work	Aaron Patterson	2011-11-18	1	-15/+7
\| * \| \| \|	make sure to require the right deprecation warning file	Aaron Patterson	2011-11-18	1	-0/+1
\| * \| \| \|	arity check has been pushed up, so no need for proc wrapping	Aaron Patterson	2011-11-18	1	-1/+1