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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\|/ / /
* \| \|	Merge pull request #3613 from mitio/fix-actionpack-responder-docs	Xavier Noria	2011-11-11	1	-4/+4
\|\ \ \
\| * \| \|	Fix wording and minor typos in the Responder RDoc	Dimitar Dimitrov	2011-11-11	1	-4/+4
* \| \| \|	Merge pull request #3592 from avakhov/av-highlight-regexp	José Valim	2011-11-10	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Fix and simplify highlight regexp	Alexey Vakhov	2011-11-10	1	-1/+1
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #3581 from amatsuda/metal_response_body_19	José Valim	2011-11-10	1	-1/+7
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Fix AC::Metal#response_body= to store same value on Ruby 1.8 and 1.9	Akira Matsuda	2011-11-07	1	-1/+7
* \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-11-08	2	-13/+6
\|\ \ \ \
\| * \| \| \|	Fix small typo in link_to_function doc	Alexey Vakhov	2011-11-08	1	-1/+1
\| * \| \| \|	Fixed stale doc in AbstractController::Layouts	Dalibor Nasevic	2011-11-06	1	-12/+5
\| \|/ / /
* \| \| \|	Fix trouble using :subdomain in development environment when using numeri...	Bradford Folkens	2011-11-08	1	-1/+1
* \| \| \|	DrbStore removed from cache backends	Ivan Evtukhovich	2011-11-07	1	-1/+0
* \| \| \|	fix incorrect code example	Vijay Dev	2011-11-07	1	-1/+1
\|/ / /
* \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-11-06	1	-2/+2
\|\ \ \
\| * \| \|	Docs cosmetic fixes in Action View form_helper.rb	Alexey Vakhov	2011-11-06	1	-2/+2
* \| \| \|	RUBY_ENGINE is not defined on 1.8	Jon Leighton	2011-11-06	1	-1/+1
* \| \| \|	Implement a workaround for a bug in ruby-1.9.3p0.	Jon Leighton	2011-11-06	2	-0/+26
\|/ / /
* \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-11-05	3	-5/+7
\|\ \ \
\| * \| \|	Fix javascript_include_tag examples in documentation	Alexey Vakhov	2011-11-03	1	-2/+2
\| * \| \|	Fix small typos in routing docs	Alexey Vakhov	2011-11-03	1	-1/+3
\| * \| \|	Fix typo in Dispatcher#controller documentation	Aviv Ben-Yosef	2011-11-01	1	-1/+1
\| * \| \|	Fix typo in constraints method documentation	Alexey Vakhov	2011-11-01	1	-1/+1
* \| \| \|	Remove 'size' attribute from number_field form helper fixes #3454	Waseem Ahmad	2011-11-04	1	-0/+2
\| \|_\|/ \|/\| \|
* \| \|	this should never return nil, so no use for "try"	Aaron Patterson	2011-10-31	1	-1/+1
* \| \|	Ensure that the format isn't applied twice to the cache key, else it becomes ...	Christopher Meiklejohn	2011-10-31	1	-1/+1
\|/ /
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-10-30	2	-4/+4
\|\ \