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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
* \| \|	require that all blocks have arity of 2	Aaron Patterson	2011-11-18	1	-5/+10
* \| \|	copy options keys to the right place so that undo will work correctly	Aaron Patterson	2011-11-18	1	-10/+4
* \| \|	no need for type checking	Aaron Patterson	2011-11-18	1	-1/+1
* \| \|	cleaning up variable names to match method parameter names	Aaron Patterson	2011-11-18	1	-6/+8
* \| \|	stop doing is_a? checks on the resource type	Aaron Patterson	2011-11-18	1	-4/+4
* \| \|	move constants to methods since nothing else is using them	Aaron Patterson	2011-11-18	1	-6/+5
* \| \|	pushing hash validation up	Aaron Patterson	2011-11-18	1	-13/+14
* \| \|	breaking match down to smaller methods	Aaron Patterson	2011-11-18	1	-19/+22
* \| \|	some refactoring of the match method	Aaron Patterson	2011-11-18	1	-25/+17
* \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-11-18	1	-1/+2
\|\ \ \
\| * \| \|	put back the removed eg	Vijay Dev	2011-11-18	1	-0/+1
\| * \| \|	Fix a number_with_delimiter :separator example	Edward Anderson	2011-11-17	1	-1/+1
* \| \| \|	_html translation should escape interpolated arguments	lest	2011-11-17	1	-4/+9
* \| \| \|	Revert "warn the user values are directly interpolated into _html translation...	Xavier Noria	2011-11-17	1	-2/+0
* \| \| \|	warn the user values are directly interpolated into _html translation strings	Xavier Noria	2011-11-17	1	-0/+2
* \| \| \|	Merge pull request #3654 from wildchild/label_i18n	José Valim	2011-11-17	1	-1/+9
\|\ \ \ \
\| * \| \| \|	Fix impractical I18n lookup in nested fields_for	Alexander Uvarov	2011-11-17	1	-1/+9
* \| \| \| \|	It should be @calculated_ip not @calculate_ip	Arun Agrawal	2011-11-17	1	-1/+1
\|/ / / /
* \| \| \|	Initialize our instance variables.	Aaron Patterson	2011-11-16	1	-1/+3
* \| \| \|	Merge pull request #3649 from indirect/remote_ip	Aaron Patterson	2011-11-16	2	-5/+7
\|\ \ \ \