Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | 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 | |||||
* | | 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 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 | |
|/ / | ||||||
* | | 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' | |||||
* | | 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 | |
|/ | ||||||
* | Adds missing closing regex slashes. | mjy | 2011-10-25 | 1 | -2/+2 | |
| | ||||||
* | Add ActionDispatch::Session::CacheStore as a generic way of storing sessions ↵ | Brian Durand | 2011-10-21 | 1 | -0/+50 | |
| | | | | in a cache. | |||||
* | Remove the unneeded `\d` when sanitizing `X-Request-Id`. | Marc Bowes | 2011-10-20 | 1 | -1/+1 | |
| | ||||||
* | Load object/blank and make use of presence. | José Valim | 2011-10-19 | 1 | -2/+3 | |
| | ||||||
* | Make tests run on 1.8.x, add integration setup. | José Valim | 2011-10-19 | 1 | -3/+2 | |
| | ||||||
* | Blah, SecureRandom#uuid is not supported in 1.8.7 -- cant wait for Rails 4.0 ↵ | David Heinemeier Hansson | 2011-10-19 | 1 | -1/+1 | |
| | | | | to drop compatibility with 1.8.x | |||||
* | Require missing string access dependency. | José Valim | 2011-10-19 | 1 | -0/+1 | |
| | ||||||
* | Require securerandom as it is the proper dependency. | José Valim | 2011-10-19 | 1 | -1/+1 | |
| | ||||||
* | Added X-Request-Id tracking and TaggedLogging to easily log that and other ↵ | David Heinemeier Hansson | 2011-10-19 | 2 | -0/+48 | |
| | | | | production concerns | |||||
* | Remove superfluous assignment in cookies | Alexey Vakhov | 2011-10-18 | 1 | -1/+1 | |
| | ||||||
* | / is allowed in URI fragments | Jeremy Kemper | 2011-10-13 | 1 | -1/+1 | |
| | ||||||
* | Leave escaping up to Journey | Jeremy Kemper | 2011-10-13 | 1 | -4/+3 | |
| | ||||||
* | Add some implementation docs. closes #3298. closes #2509. | José Valim | 2011-10-12 | 1 | -0/+4 | |
| | ||||||
* | allow shorthand routes with nested optional parameters | Diego Carrion | 2011-10-10 | 1 | -3/+3 | |
| | ||||||
* | fix require | Aaron Patterson | 2011-10-06 | 1 | -1/+1 | |
| | ||||||
* | Clean up subdomain code a bit. | José Valim | 2011-10-04 | 1 | -2/+2 | |
| | ||||||
* | :subdomain can now be specified with a value of false in url_for, allowing ↵ | Kamil Sobieraj | 2011-10-04 | 2 | -5/+8 | |
| | | | | for subdomain(s) removal from the host during link generation. Closes #2025 | |||||
* | TestCase should respect the view_assigns API instead of pulling variables on ↵ | José Valim | 2011-10-02 | 1 | -6/+1 | |
| | | | | its own. | |||||
* | Implement Mime::Type#respond_to? (consistently with #method_missing) | Evgeniy Dolzhenko | 2011-09-25 | 1 | -0/+4 | |
| | ||||||
* | Revert "Make process reuse the env var passed as argument" | Santiago Pastorino | 2011-09-24 | 1 | -4/+4 | |
| | | | | This reverts commit 0e4748cd415660eb91e63d50aa15cdd027c612dd. | |||||
* | Deprecate passing the template handler in the template name. | José Valim | 2011-09-22 | 1 | -2/+2 | |
| | | | | | | For example, calling hello.erb is now deprecated. Since Rails 3.0 passing the handler had no effect whatsover. This commit simply deprecates such cases so we can clean up the code in later releases. | |||||
* | Fix named routes modifying arguments | Pawel Pierzchala | 2011-09-22 | 1 | -3/+4 | |
| | ||||||
* | removing backwards compatibility module | Aaron Patterson | 2011-09-12 | 3 | -9/+8 | |
| | ||||||
* | partially expand the parameters to `match` | Aaron Patterson | 2011-09-12 | 1 | -3/+3 | |
| | ||||||
* | unfactor the Route class to private factory methods | Aaron Patterson | 2011-09-12 | 2 | -45/+42 | |
| | ||||||
* | reduce dependencies of external objects in the Route class | Aaron Patterson | 2011-09-12 | 2 | -16/+18 | |
| |