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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| \| \|
\| * \|	refactor RemoteIp middleware	Andre Arko	2011-11-11	2	-55/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- return the last forwarded IP before REMOTE_ADDR to handle proxies - remove completely superfluous RemoteIpGetter class - remove duplication of trusted proxies regexp - remove unused constant from Request - move comments from Request to where they are actually relevant - edit comments for clarity of purpose The original code (confusingly) tried to return REMOTE_ADDR both at the beginning and the end of the chain of options. Since REMOTE_ADDR is _always_ set, this is kind of silly. This change leaves REMOTE_ADDR as the last option, so that proxied requests will be assigned the correct remote IP address.
* \| \|	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
\| * \|	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
\| * \| \|	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
\|\ \ \ \| \|/ / \|/\| \|	AC::Metal#response_body= stores different value in Ruby 1.8 and 1.9
\| * \|	Fix AC::Metal#response_body= to store same value on Ruby 1.8 and 1.9	Akira Matsuda	2011-11-07	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \|	This was because String#respond_to?(:each) differs in 1.8 and 1.9
* \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-11-08	2	-13/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: railties/guides/source/active_record_querying.textile
\| * \| \|	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 ↵	Bradford Folkens	2011-11-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	numeric addresses. See-also pull request #3561 from 3-1-stable Otherwise the following occurs: TypeError: can't convert nil into String /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/http/url.rb:75:in host_or_subdomain_and_domain' /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/http/url.rb:37:in url_for' /Users/bfolkens/dev/bfolkens-rails-core/actionpack/lib/action_dispatch/routing/url_for.rb:147:in test_subdomain_may_be_accepted_with_numeric_host' /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/testing/setup_and_teardown.rb:67:in run' /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/callbacks.rb:426:in send' /Users/bfolkens/dev/bfolkens-rails-core/activesupport/lib/active_support/callbacks.rb:81:in run'
* \| \|	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
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The bug is that an error would be raised while attempting to convert a template from one encoding to another. Please see http://redmine.ruby-lang.org/issues/5564 for more details. The workaround is to load all conversions into memory ahead of time, and will only happen if the ruby version is exactly 1.9.3p0. The hope is obviously that the underlying problem will be resolved in the next patchlevel release of 1.9.3.
* \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	f.number_field generates <input type="number", size="30"../> which is invalid HTML5. See: http://dev.w3.org/html5/spec/Overview.html#number-state
* \| \|	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
\|/ / \| \| \| \| \| \|	impossible to target with expire_action.
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-10-30	2	-4/+4
\|\ \
\| * \|	Adds missing closing regex slashes.	mjy	2011-10-25	1	-2/+2
\| \| \|
\| * \|	add namespacing when referring to ActionController::RedirectBackError	Nick Howard	2011-10-25	1	-2/+2
\| \| \|
* \| \|	Add missing type to number_field_tag documentation	Paul McMahon	2011-10-28	1	-1/+1
\| \| \|
* \| \|	scumbag 1.8: strings are enumerable :'(	Aaron Patterson	2011-10-26	1	-1/+1
\| \| \|
* \| \|	Responders now return 204 No Content for API requests without a response ↵	José Valim	2011-10-26	1	-21/+1
\| \| \| \| \| \| \| \| \| \| \| \|	body (as in the new scaffold)
* \| \|	properly handle lists of lists. Thanks @adrianpike for reporting!	Aaron Patterson	2011-10-25	1	-1/+6
\|/ /
* \|	Add ActionDispatch::Session::CacheStore as a generic way of storing sessions ↵	Brian Durand	2011-10-21	2	-0/+51
\| \| \| \| \| \| \| \|	in a cache.
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-10-20	2	-3/+3
\|\ \
\| * \|	HTMl -> HTML: html scanner comment fix	Alexey Vakhov	2011-10-15	1	-1/+1
\| \| \|
\| * \|	Update AC::RecordIdentifier example	Alexey Vakhov	2011-10-15	1	-2/+2
\| \| \|
* \| \|	Remove the unneeded `\d` when sanitizing `X-Request-Id`.	Marc Bowes	2011-10-20	1	-1/+1
\| \| \|