| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-11-18 | 1 | -1/+2 |
| |\ | |||||
| | * | put back the removed eg | Vijay Dev | 2011-11-18 | 1 | -0/+1 |
| | | | |||||
| | * | Fix a number_with_delimiter :separator example | Edward Anderson | 2011-11-17 | 1 | -1/+1 |
| | | | |||||
| * | | _html translation should escape interpolated arguments | lest | 2011-11-17 | 3 | -4/+29 |
| | | | |||||
| * | | Revert "warn the user values are directly interpolated into _html ↵ | Xavier Noria | 2011-11-17 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | translation strings" Reason: After another round of discussion, it has been decided to let interpolation deal with unsafe strings as it should do. This reverts commit d57d8098fc269a26ea0051a9027a33af1a9a4b2b. | ||||
| * | | warn the user values are directly interpolated into _html translation strings | Xavier Noria | 2011-11-17 | 1 | -0/+2 |
| | | | |||||
| * | | Merge pull request #3654 from wildchild/label_i18n | José Valim | 2011-11-17 | 2 | -1/+55 |
| |\ \ | | | | | | | Fix impractical I18n lookup in nested fields_for | ||||
| | * | | Fix impractical I18n lookup in nested fields_for | Alexander Uvarov | 2011-11-17 | 2 | -1/+55 |
| | | | | |||||
| * | | | 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 | ||||
| * | | | Switch from marshal format to plain text for the encoding conversions dump. ↵ | Jon Leighton | 2011-11-16 | 3 | -6/+95 |
| | | | | | | | | | | | | | This is for windows compatibility. Fixes #3644. | ||||
| * | | | 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 |
| | | | | |||||
| * | | | add test for bug fixed in 4f2bf64 | Andre Arko | 2011-11-14 | 1 | -0/+5 |
| | | | | |||||
| * | | | 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 |
| | | | | |||||
| * | | | Sync changelog entry | Jon Leighton | 2011-11-14 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge pull request #3625 from guilleiguaran/sprockets-2.1.0 | Jon Leighton | 2011-11-14 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | Upgrade Sprockets to 2.1.0 | ||||
| | * | | | Upgrade Sprockets to 2.1.0 | Guillermo Iguaran | 2011-11-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | This version brings bug fixes for performance and caching. | ||||
| * | | | | Sync CHANGELOGs from 3-1-stable | Jon Leighton | 2011-11-14 | 1 | -0/+11 |
| | | | | | |||||
| * | | | | 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 |
| | | | | | |||||
| * | | | | change tests to expect X-F-F over REMOTE_ADDR | 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 | 2 | -1/+5 |
| |\ \ \ \ | | | | | | | | | | | Fix and simplify highlight regexp | ||||
| | * | | | | Fix and simplify highlight regexp | Alexey Vakhov | 2011-11-10 | 2 | -1/+5 |
| | | |/ / | |/| | | |||||
| * | | | | Merge pull request #3581 from amatsuda/metal_response_body_19 | José Valim | 2011-11-10 | 2 | -1/+13 |
| |\ \ \ \ | |/ / / |/| | | | AC::Metal#response_body= stores different value in Ruby 1.8 and 1.9 | ||||
| | * | | | A test case to ensure that AC::Metal#response_body= always wraps the given ↵ | Akira Matsuda | 2011-11-10 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | value in an Array in both Ruby 1.8 and 1.9 (refs #3581) | ||||
| | * | | | 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 | 2 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| |/ / / | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |
path: root/actionpack