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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #3878 from kennyj/should_use_default_charset	José Valim	2011-12-07	1	-1/+1
\|\
\| *	Use default charset when we read content type without charset.	kennyj	2011-12-07	1	-1/+1
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-12-06	1	-4/+4
\|\ \ \| \|/ \|/\|
\| *	Use do end for multiline block.	Uģis Ozols	2011-12-05	1	-2/+2
\| *	.rhtml and .rxml was removed in Rails 3.	Uģis Ozols	2011-12-05	1	-2/+2
* \|	Merge pull request #3428 from adrianpike/asset_path_conflicts	Santiago Pastorino	2011-12-06	1	-8/+9
\|\ \
\| * \|	Let's do the same trick for asset_path that we do for [image,javascript,style...	Adrian Pike	2011-12-05	1	-8/+9
* \| \|	Allowing string as url argument for expire_action	Thomas von Deyen	2011-12-06	1	-3/+2
\|/ /
* \|	Merge pull request #3861 from andyjeffries/master	José Valim	2011-12-05	1	-1/+1
\|\ \
\| * \|	Named Routes shouldn't override existing ones (currently route recognition go...	Andy Jeffries	2011-12-05	1	-1/+1
* \| \|	use classify in ParamsWrapper to derive model name from controller name	lest	2011-12-05	1	-1/+1
\|/ /
* \|	Minor enhancement by not unnecessarely escaping forward slashing within a cur...	Overbryd	2011-12-05	1	-1/+2
* \|	Fix for redirect_to to respect urls with a network path reference like "//ass...	Overbryd	2011-12-05	1	-2/+2
* \|	form_for with +:as+ option uses "action_as" as css class and id	Vasiliy Ermolovich	2011-12-04	1	-2/+2
\|/
*	Fix failing cascade exception.	José Valim	2011-12-03	2	-2/+3
*	Try to play nice with plugins doing monkey patches.	José Valim	2011-12-02	1	-0/+5
*	Merge branch 'exceptions' with the following features:	José Valim	2011-12-01	6	-140/+213
\|\
\| *	Split and improve show and debug exceptions middlewares.	José Valim	2011-12-01	1	-11/+11
\| *	Split ShowExceptions responsibilities in two middlewares.	José Valim	2011-12-01	4	-82/+107
\| *	Add a deprecation to old show exceptions API (even though it was not public).	José Valim	2011-12-01	1	-0/+14
\| *	Add an ExceptionWrapper that wraps an exception and provide convenience helpers.	José Valim	2011-12-01	5	-77/+104
\| *	Allow rescue responses to be configured through a railtie.	José Valim	2011-12-01	2	-9/+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	-4/+49
\|/
*	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