Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-30 | 2 | -7/+7 | |
|\ | ||||||
| * | Fixing incorrect documentation | Aviv Ben-Yosef | 2011-11-30 | 1 | -2/+2 | |
| | | | | | | `path_names` can only be used for affecting `new` and `edit` | |||||
| * | Fix ActionDispatch::Request method explanations | Travis Pew | 2011-11-28 | 1 | -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 env | lest | 2011-11-28 | 1 | -13/+13 | |
|/ | ||||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-26 | 1 | -2/+2 | |
|\ | ||||||
| * | what's -> that's | Uģis Ozols | 2011-11-25 | 1 | -1/+1 | |
| | | ||||||
| * | Remove unnecessary comment. | Uģis Ozols | 2011-11-25 | 1 | -1/+1 | |
| | | ||||||
* | | middlewares should use logger from env | lest | 2011-11-25 | 2 | -9/+13 | |
| | | ||||||
* | | configuration option to always write cookie | lest | 2011-11-23 | 2 | -2/+7 | |
| | | ||||||
* | | Remove unreachable code, and add additional testcases. | kennyj | 2011-11-24 | 1 | -6/+1 | |
| | | ||||||
* | | deprecation warning, changelog entry | lest | 2011-11-22 | 1 | -1/+3 | |
| | | ||||||
* | | add ActionController::Metal#show_detailed_exceptions? | lest | 2011-11-22 | 1 | -9/+7 | |
| | | ||||||
* | | Revert "copy options keys to the right place so that undo will work correctly" | Aaron Patterson | 2011-11-19 | 1 | -4/+10 | |
| | | | | | | | | This reverts commit 3178cc9a80262d3bf7754f3507ef60243b46634f. | |||||
* | | Warning removed for shadowing variable | Arun Agrawal | 2011-11-19 | 1 | -1/+1 | |
| | | ||||||
* | | Revert "make sure to require the right deprecation warning file" | Aaron Patterson | 2011-11-18 | 1 | -1/+0 | |
| | | | | | | | | This reverts commit 9d725e3df502a07222f35576108eb2df2bd88259. | |||||
* | | Refactoring the redirect method for the router api. | Aaron Patterson | 2011-11-18 | 1 | -25/+19 | |
| | | ||||||
* | | moving redirection to objects | Aaron Patterson | 2011-11-18 | 1 | -45/+58 | |
| | | ||||||
* | | remove the :path feature to redirects, since it cannot work | Aaron Patterson | 2011-11-18 | 1 | -15/+7 | |
| | | ||||||
* | | make sure to require the right deprecation warning file | Aaron Patterson | 2011-11-18 | 1 | -0/+1 | |
| | | ||||||
* | | arity check has been pushed up, so no need for proc wrapping | Aaron Patterson | 2011-11-18 | 1 | -1/+1 | |
| | | ||||||
* | | require that all blocks have arity of 2 | Aaron Patterson | 2011-11-18 | 1 | -5/+10 | |
| | | ||||||
* | | copy options keys to the right place so that undo will work correctly | Aaron Patterson | 2011-11-18 | 1 | -10/+4 | |
| | | ||||||
* | | no need for type checking | Aaron Patterson | 2011-11-18 | 1 | -1/+1 | |
| | | ||||||
* | | cleaning up variable names to match method parameter names | Aaron Patterson | 2011-11-18 | 1 | -6/+8 | |
| | | ||||||
* | | stop doing is_a? checks on the resource type | Aaron Patterson | 2011-11-18 | 1 | -4/+4 | |
| | | ||||||
* | | move constants to methods since nothing else is using them | Aaron Patterson | 2011-11-18 | 1 | -6/+5 | |
| | | ||||||
* | | pushing hash validation up | Aaron Patterson | 2011-11-18 | 1 | -13/+14 | |
| | | ||||||
* | | breaking match down to smaller methods | Aaron Patterson | 2011-11-18 | 1 | -19/+22 | |
| | | ||||||
* | | some refactoring of the match method | Aaron Patterson | 2011-11-18 | 1 | -25/+17 | |
|/ | ||||||
* | 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' |