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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 3178cc9a80262d3bf7754f3507ef60243b46634f.
* \| \| \|	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
\| * \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 9d725e3df502a07222f35576108eb2df2bd88259.
* \| \| \|	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 ↵	Xavier Noria	2011-11-17	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	translation strings" Reason: After another round of discussion, it has been decided to let interpolation deal with unsafe strings as it should do. This reverts commit d57d8098fc269a26ea0051a9027a33af1a9a4b2b.
* \| \| \|	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
\| * \| \| \|	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
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	We are using @calculated_ip. @calculate_ip is no where used
* \| \| \|	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
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fixes for Request#remote_ip (no middleware, all proxies)
\| * \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 8d1a2b3ecde5a8745b3eaab4763a71d80ca3441f, because I have fixed the issues this commit caused in the next commit.
* \| \| \| \|	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.
\| * \| \| \|	CSS fix to prevent error output from being breaking out of body element.	Olivier Lacan	2011-11-03	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using the white-space: pre-wrap adds extra line breaks to prevent the text from breaking out of the element's box. In this case single line output can be extremely long, breaking out the <body> element. See for reference: http://www.quirksmode.org/css/whitespace.html Before: http://link.olivierlacan.com/BVU4 After: http://link.olivierlacan.com/BUfM
* \| \| \| \|	Switch from marshal format to plain text for the encoding conversions dump. ↵	Jon Leighton	2011-11-16	3	-6/+95
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is for windows compatibility. Fixes #3644.
* \| \| \| \|	Revert "Merge pull request #3640 from indirect/remote_ip"	Jon Leighton	2011-11-15	2	-8/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 6491aadc525b8703708e0fd0fbf05bd436a47801, reversing changes made to 83bf0b626cf2134260903e57d74f67de57384073. See https://github.com/rails/rails/pull/3640#issuecomment-2752761 for explanation.
* \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was an especially nasty bug introduced in 317f4e2, by the way that an instance of GetIp is not nil, but GetIp#to_s could sometimes return nil. Gross, huh?
* \| \| \| \|	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
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	refactor RemoteIp middleware
\| * \| \| \| \|	defer calculating the remote IP until requested	Andre Arko	2011-11-12	1	-24/+36
\| \| \| \| \| \|