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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\|\ \
\| * \|	the object itself isn't the IP, #to_s is the IP	Andre Arko	2011-11-16	1	-1/+1
\| * \|	:facepalm: Request#remote_ip has to work without the middleware	Andre Arko	2011-11-16	2	-3/+3
\| * \|	Revert "Revert "Merge pull request #3640 from indirect/remote_ip""	Andre Arko	2011-11-16	2	-6/+8
* \| \|	Merge pull request #3500 from olivierlacan/error-whitespace	Jon Leighton	2011-11-16	1	-0/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	CSS fix to prevent error output from being breaking out of body element.	Olivier Lacan	2011-11-03	1	-0/+1
* \| \|	Switch from marshal format to plain text for the encoding conversions dump. T...	Jon Leighton	2011-11-16	3	-6/+95
* \| \|	Revert "Merge pull request #3640 from indirect/remote_ip"	Jon Leighton	2011-11-15	2	-8/+6
* \| \|	GetIp#to_s should never return nil. That's icky.	Andre Arko	2011-11-14	2	-6/+8
* \| \|	Return the calculated remote_ip or ip	Andre Arko	2011-11-14	1	-1/+2
* \| \|	memoize the relatively expensive remote IP code	Andre Arko	2011-11-14	1	-1/+7
* \| \|	cleaner names	Andre Arko	2011-11-14	1	-6/+6
* \| \|	remove ignored flag, fixes warnings	Andre Arko	2011-11-13	1	-1/+1
* \| \|	turns out the tests expect remote_addrs.first	Andre Arko	2011-11-13	1	-1/+1
* \| \|	correctly raise IpSpoofAttackError message	Andre Arko	2011-11-13	1	-2/+2
\| \|/ \|/\|
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-11-13	1	-2/+2
\|\ \
\| * \|	Cosmetic fix in number_to_currency docs	Alexey Vakhov	2011-11-10	1	-2/+2
* \| \|	Merge pull request #3617 from indirect/remote_ip	José Valim	2011-11-13	2	-53/+55
\|\ \ \
\| * \| \|	defer calculating the remote IP until requested	Andre Arko	2011-11-12	1	-24/+36
\| * \| \|	refactor RemoteIp middleware	Andre Arko	2011-11-11	2	-55/+45
* \| \| \|	Unneeded require memoizable	Akira Matsuda	2011-11-12	1	-2/+0
\|/ / /