aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-302-7/+7
|\
| * Fixing incorrect documentation Aviv Ben-Yosef2011-11-301-2/+2
| | | | | | `path_names` can only be used for affecting `new` and `edit`
| * Fix ActionDispatch::Request method explanationsTravis Pew2011-11-281-5/+5
| | | | | | | | | | | | | | | | The methods, "post?", "put?", "head?", etc. contain an incorrect explanation. They state that they are equivalent to request_method == :type, but this is not accurate because the methods convert the string to a symbol. They are actually equivalent to: request_method_symbol == :type
* | put backtrace_cleaner to envlest2011-11-281-13/+13
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-261-2/+2
|\
| * what's -> that'sUģis Ozols2011-11-251-1/+1
| |
| * Remove unnecessary comment.Uģis Ozols2011-11-251-1/+1
| |
* | middlewares should use logger from envlest2011-11-252-9/+13
| |
* | configuration option to always write cookielest2011-11-232-2/+7
| |
* | Remove unreachable code, and add additional testcases.kennyj2011-11-241-6/+1
| |
* | deprecation warning, changelog entrylest2011-11-221-1/+3
| |
* | add ActionController::Metal#show_detailed_exceptions?lest2011-11-221-9/+7
| |
* | Revert "copy options keys to the right place so that undo will work correctly"Aaron Patterson2011-11-191-4/+10
| | | | | | | | This reverts commit 3178cc9a80262d3bf7754f3507ef60243b46634f.
* | Warning removed for shadowing variableArun Agrawal2011-11-191-1/+1
| |
* | Revert "make sure to require the right deprecation warning file"Aaron Patterson2011-11-181-1/+0
| | | | | | | | This reverts commit 9d725e3df502a07222f35576108eb2df2bd88259.
* | Refactoring the redirect method for the router api.Aaron Patterson2011-11-181-25/+19
| |
* | moving redirection to objectsAaron Patterson2011-11-181-45/+58
| |
* | remove the :path feature to redirects, since it cannot workAaron Patterson2011-11-181-15/+7
| |
* | make sure to require the right deprecation warning fileAaron Patterson2011-11-181-0/+1
| |
* | arity check has been pushed up, so no need for proc wrappingAaron Patterson2011-11-181-1/+1
| |
* | require that all blocks have arity of 2Aaron Patterson2011-11-181-5/+10
| |
* | copy options keys to the right place so that undo will work correctlyAaron Patterson2011-11-181-10/+4
| |
* | no need for type checkingAaron Patterson2011-11-181-1/+1
| |
* | cleaning up variable names to match method parameter namesAaron Patterson2011-11-181-6/+8
| |
* | stop doing is_a? checks on the resource typeAaron Patterson2011-11-181-4/+4
| |
* | move constants to methods since nothing else is using themAaron Patterson2011-11-181-6/+5
| |
* | pushing hash validation upAaron Patterson2011-11-181-13/+14
| |
* | breaking match down to smaller methodsAaron Patterson2011-11-181-19/+22
| |
* | some refactoring of the match methodAaron Patterson2011-11-181-25/+17
|/
* It should be @calculated_ip not @calculate_ipArun Agrawal2011-11-171-1/+1
| | | | We are using @calculated_ip. @calculate_ip is no where used
* Initialize our instance variables.Aaron Patterson2011-11-161-1/+3
|
* Merge pull request #3649 from indirect/remote_ipAaron Patterson2011-11-162-5/+7
|\ | | | | Fixes for Request#remote_ip (no middleware, all proxies)
| * the object itself isn't the IP, #to_s is the IPAndre Arko2011-11-161-1/+1
| |
| * :facepalm: Request#remote_ip has to work without the middlewareAndre Arko2011-11-162-3/+3
| |
| * Revert "Revert "Merge pull request #3640 from indirect/remote_ip""Andre Arko2011-11-162-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-whitespaceJon Leighton2011-11-161-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 Lacan2011-11-031-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
* | Revert "Merge pull request #3640 from indirect/remote_ip"Jon Leighton2011-11-152-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 Arko2011-11-142-6/+8
| |
* | Return the calculated remote_ip or ipAndre Arko2011-11-141-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 codeAndre Arko2011-11-141-1/+7
| |
* | cleaner namesAndre Arko2011-11-141-6/+6
| |
* | remove ignored flag, fixes warningsAndre Arko2011-11-131-1/+1
| |
* | turns out the tests expect remote_addrs.firstAndre Arko2011-11-131-1/+1
| |
* | correctly raise IpSpoofAttackError messageAndre Arko2011-11-131-2/+2
| |
* | Merge pull request #3617 from indirect/remote_ipJosé Valim2011-11-132-53/+55
|\ \ | | | | | | refactor RemoteIp middleware
| * | defer calculating the remote IP until requestedAndre Arko2011-11-121-24/+36
| | |
| * | refactor RemoteIp middlewareAndre Arko2011-11-112-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 memoizableAkira Matsuda2011-11-121-2/+0
|/ /
* | Fix trouble using :subdomain in development environment when using ↵Bradford Folkens2011-11-081-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'