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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #3428 from adrianpike/asset_path_conflicts	Santiago Pastorino	2011-12-06	1	-0/+57
\|\
\| *	Let's do the same trick for asset_path that we do for [image,javascript,style...	Adrian Pike	2011-12-05	1	-0/+57
* \|	Allowing string as url argument for expire_action	Thomas von Deyen	2011-12-06	1	-0/+20
\|/
*	Merge pull request #3861 from andyjeffries/master	José Valim	2011-12-05	1	-2/+2
\|\
\| *	Named Routes shouldn't override existing ones (currently route recognition go...	Andy Jeffries	2011-12-05	1	-2/+2
* \|	use classify in ParamsWrapper to derive model name from controller name	lest	2011-12-05	1	-0/+35
\|/
*	Fix for redirect_to to respect urls with a network path reference like "//ass...	Overbryd	2011-12-05	1	-0/+10
*	form_for with +:as+ option uses "action_as" as css class and id	Vasiliy Ermolovich	2011-12-04	1	-11/+11
*	Fix failing cascade exception.	José Valim	2011-12-03	1	-0/+9
*	Merge branch 'exceptions' with the following features:	José Valim	2011-12-01	4	-90/+144
\|\
\| *	Remove unnecessary test setup.	José Valim	2011-12-01	1	-6/+1
\| *	Split and improve show and debug exceptions middlewares.	José Valim	2011-12-01	2	-76/+130
\| *	Split ShowExceptions responsibilities in two middlewares.	José Valim	2011-12-01	3	-11/+16
* \|	Revert "Added ActiveRecord::Base#last_modified to work with the new fresh_whe...	David Heinemeier Hansson	2011-12-01	1	-2/+2
* \|	Added ActiveRecord::Base#last_modified to work with the new fresh_when/stale?...	David Heinemeier Hansson	2011-12-01	1	-2/+2
* \|	Allow fresh_when/stale? to take a record instead of an options hash [DHH]	David Heinemeier Hansson	2011-12-01	1	-0/+46
\|/
*	fix method redefined warnings in tests	lest	2011-11-30	3	-12/+5
*	fix warning in tests when using render_erb helper	lest	2011-11-30	1	-0/+2
*	test helpers in erb using erb	lest	2011-11-30	6	-17/+31
*	Log 'Filter chain halted as CALLBACKNAME rendered or redirected' every time a...	José Valim	2011-11-30	1	-1/+12
*	Deprecate set_sequence_name in favour of self.sequence_name=	Jon Leighton	2011-11-29	1	-2/+2
*	Deprecate set_table_name in favour of self.table_name= or defining your own m...	Jon Leighton	2011-11-29	2	-9/+9
*	Handle correctly optional parameters for callable asset_host.	Marc-Andre Lafortune	2011-11-29	1	-0/+8
*	put backtrace_cleaner to env	lest	2011-11-28	1	-0/+7
*	add namespace options to form_for	Vasiliy Ermolovich	2011-11-27	1	-0/+76
*	fix label with block in erb	lest	2011-11-27	2	-0/+11
*	Revert the serializers API as other alternatives are now also under discussion	José Valim	2011-11-25	1	-48/+0
*	Merge pull request #3747 from lest/middleware-logger	José Valim	2011-11-25	4	-22/+21
\|\
\| *	middlewares should use logger from env	lest	2011-11-25	4	-22/+21
* \|	Merge branch 'serializers'	José Valim	2011-11-25	1	-0/+48
\|\ \ \| \|/ \|/\|
\| *	Rely solely on active_model_serializer and remove the fancy constant lookup.	José Valim	2011-11-23	1	-1/+15
\| *	Merge branch 'master' into serializers	José Valim	2011-11-23	22	-120/+537
\| \|\
\| * \|	Initial commit of serializer support	Jose and Yehuda	2011-10-15	1	-0/+34
* \| \|	configuration option to always write cookie	lest	2011-11-23	1	-2/+2
* \| \|	Merge pull request #3733 from kennyj/fix_warnings_for_show_exceptions_test	Yehuda Katz	2011-11-23	1	-3/+3
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Warnings removed. (ambiguous first argument)	kennyj	2011-11-24	1	-3/+3
* \| \|	Rely on a public contract between railties instead of accessing railtie metho...	José Valim	2011-11-23	3	-7/+5
* \| \|	Remove unreachable code, and add additional testcases.	kennyj	2011-11-24	2	-0/+24
\|/ /
* \|	Merge pull request #3718 from lest/fix-javascript-include-tag	José Valim	2011-11-22	1	-0/+3
\|\ \
\| * \|	javascript_include_tag should add '.js' to sources that contain '.'	lest	2011-11-22	1	-0/+3
* \| \|	move show_detailed_exceptions? to Rescue module	lest	2011-11-22	1	-2/+2
* \| \|	refactor show exceptions tests	lest	2011-11-22	2	-42/+78
* \| \|	add ActionController::Metal#show_detailed_exceptions?	lest	2011-11-22	1	-19/+26
\|/ /
* \|	Merge pull request #3695 from tobiassvn/partial_path_error	Yehuda Katz	2011-11-19	1	-0/+7
\|\ \
\| * \|	Meaningful errors for unexpected partial arguments. Fixes #3573	Tobias Svensson	2011-11-19	1	-0/+7
* \| \|	Don't html-escape the :count option to translate if it's a Numeric. Fixes #3685.	Jon Leighton	2011-11-19	1	-1/+11
\|/ /
* \|	Refactoring the redirect method for the router api.	Aaron Patterson	2011-11-18	1	-0/+5
* \|	remove the :path feature to redirects, since it cannot work	Aaron Patterson	2011-11-18	1	-33/+0
* \|	require that all blocks have arity of 2	Aaron Patterson	2011-11-18	1	-1/+1
* \|	_html translation should escape interpolated arguments	lest	2011-11-17	1	-0/+6