github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
26,232 Commits 34 Branches 105 Tags
2a76f33b511c745fd511e0049e63c426bb511b67
Commit Graph

1094 Commits

Author SHA1 Message Date
lest
fe7d4f09ef put backtrace_cleaner to env 2011-11-28 19:25:37 +03:00
Vijay Dev
1d89540686 Merge branch 'master' of github.com:lifo/docrails 2011-11-26 19:14:39 +05:30
Uģis Ozols
a607a9d978 what's -> that's 2011-11-25 14:24:14 +02:00
Uģis Ozols
9a45867b09 Remove unnecessary comment. 2011-11-25 14:22:36 +02:00
lest
cd9d28d6fd middlewares should use logger from env 2011-11-25 13:09:46 +03:00
lest
98a1717e7c configuration option to always write cookie 2011-11-23 23:50:04 +03:00
kennyj
ea70e027b6 Remove unreachable code, and add additional testcases. 2011-11-24 00:25:34 +09:00
lest
3a1d51959b deprecation warning, changelog entry 2011-11-22 17:36:58 +03:00
lest
a9e8cf78fd add ActionController::Metal#show_detailed_exceptions? 2011-11-22 11:38:24 +03:00
Aaron Patterson
3d2bd69385 Revert "copy options keys to the right place so that undo will work correctly" 
This reverts commit 3178cc9a80.
 2011-11-19 20:35:54 -08:00
Arun Agrawal
d806ea2050 Warning removed for shadowing variable 2011-11-19 11:29:29 +05:30
Aaron Patterson
396ef44be4 Revert "make sure to require the right deprecation warning file" 
This reverts commit 9d725e3df502a07222f35576108eb2df2bd88259.
 2011-11-18 10:51:12 -08:00
Aaron Patterson
99d94f126d Refactoring the redirect method for the router api. 2011-11-18 10:51:12 -08:00
Aaron Patterson
d34efdd260 moving redirection to objects 2011-11-18 10:51:12 -08:00
Aaron Patterson
0809c675ef remove the :path feature to redirects, since it cannot work 2011-11-18 10:51:11 -08:00
Aaron Patterson
a8a4264858 make sure to require the right deprecation warning file 2011-11-18 10:51:11 -08:00
Aaron Patterson
163b645472 arity check has been pushed up, so no need for proc wrapping 2011-11-18 10:51:11 -08:00
Aaron Patterson
4589b2419b require that all blocks have arity of 2 2011-11-18 10:51:11 -08:00
Aaron Patterson
3178cc9a80 copy options keys to the right place so that undo will work correctly 2011-11-18 10:51:11 -08:00
Aaron Patterson
ecbae99478 no need for type checking 2011-11-18 10:51:11 -08:00
Aaron Patterson
636405d2a6 cleaning up variable names to match method parameter names 2011-11-18 10:51:10 -08:00
Aaron Patterson
33543ac871 stop doing is_a? checks on the resource type 2011-11-18 10:51:10 -08:00
Aaron Patterson
648f6113d1 move constants to methods since nothing else is using them 2011-11-18 10:51:10 -08:00
Aaron Patterson
7459ba4f6c pushing hash validation up 2011-11-18 10:51:10 -08:00
Aaron Patterson
494ab25772 breaking match down to smaller methods 2011-11-18 10:51:10 -08:00
Aaron Patterson
76780c34f5 some refactoring of the match method 2011-11-18 10:51:09 -08:00
Arun Agrawal
c3ae1d2aec It should be @calculated_ip not @calculate_ip 
We are using @calculated_ip. 
@calculate_ip is no where used
 2011-11-17 12:50:19 +05:30
Aaron Patterson
e367142255 Initialize our instance variables. 2011-11-16 16:55:11 -08:00
Aaron Patterson
70f9b74a49 Merge pull request #3649 from indirect/remote_ip 
Fixes for Request#remote_ip (no middleware, all proxies)
 2011-11-16 16:44:09 -08:00
Jon Leighton
272f2b778f Merge pull request #3500 from olivierlacan/error-whitespace 
CSS fix to prevent error output from being breaking out of body element.
 2011-11-16 15:26:31 -08:00
Andre Arko
a9044d0117 the object itself isn't the IP, #to_s is the IP 2011-11-16 13:13:22 -10:00
Andre Arko
5621abd569 🤦 Request#remote_ip has to work without the middleware 2011-11-16 12:54:18 -10:00
Andre Arko
f05ccf805a Revert "Revert "Merge pull request #3640 from indirect/remote_ip"" 
This reverts commit 8d1a2b3ecd, because I have fixed the issues this commit caused in the next commit.
 2011-11-16 12:53:43 -10:00
Jon Leighton
8d1a2b3ecd Revert "Merge pull request #3640 from indirect/remote_ip" 
This reverts commit 6491aadc52, reversing
changes made to 83bf0b626c.

See https://github.com/rails/rails/pull/3640#issuecomment-2752761 for
explanation.
 2011-11-15 22:47:18 +00:00
Andre Arko
d743954792 GetIp#to_s should never return nil. That's icky. 2011-11-14 16:43:21 -10:00
Andre Arko
4f2bf6491c Return the calculated remote_ip or ip 
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?
 2011-11-14 11:23:33 -10:00
Andre Arko
cda1a5d5fe memoize the relatively expensive remote IP code 2011-11-14 11:20:57 -10:00
Andre Arko
00a0a4ddeb cleaner names 2011-11-14 11:20:20 -10:00
Andre Arko
9c4532bf74 remove ignored flag, fixes warnings 2011-11-13 10:22:12 -10:00
Andre Arko
2d063c6269 turns out the tests expect remote_addrs.first 2011-11-13 10:20:55 -10:00
Andre Arko
2189bff732 correctly raise IpSpoofAttackError message 2011-11-13 10:20:29 -10:00
José Valim
2591cc6692 Merge pull request #3617 from indirect/remote_ip 
refactor RemoteIp middleware
 2011-11-13 04:53:51 -08:00
Akira Matsuda
b74aedff3c Unneeded require memoizable 2011-11-12 23:15:54 +09:00
Andre Arko
317f4e2236 defer calculating the remote IP until requested 2011-11-12 00:45:31 -10:00
Andre Arko
9432163c60 refactor RemoteIp middleware 
- 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.
 2011-11-11 21:25:08 -10:00
Bradford Folkens
bd559b0068 Fix trouble using :subdomain in development environment when using 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'
 2011-11-08 07:52:35 -06:00
Olivier Lacan
a50f659e08 CSS fix to prevent error output from being breaking out of body element. 
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
 2011-11-03 10:01:32 -04:00
Alexey Vakhov
7463317115 Fix small typos in routing docs 2011-11-03 08:43:28 +04:00
Aviv Ben-Yosef
702aecb126 Fix typo in Dispatcher#controller documentation 2011-11-01 08:59:20 +02:00
Alexey Vakhov
5f4550889d Fix typo in constraints method documentation 2011-11-01 08:55:03 +04:00