aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* 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
* Switch from marshal format to plain text for the encoding conversions dump. T...Jon Leighton2011-11-163-6/+95
* Revert "Merge pull request #3640 from indirect/remote_ip"Jon Leighton2011-11-152-8/+6
* GetIp#to_s should never return nil. That's icky.Andre Arko2011-11-142-6/+8
* add test for bug fixed in 4f2bf64Andre Arko2011-11-141-0/+5
* Return the calculated remote_ip or ipAndre Arko2011-11-141-1/+2
* memoize the relatively expensive remote IP codeAndre Arko2011-11-141-1/+7
* cleaner namesAndre Arko2011-11-141-6/+6
* Sync changelog entryJon Leighton2011-11-141-0/+2
* Merge pull request #3625 from guilleiguaran/sprockets-2.1.0Jon Leighton2011-11-141-1/+1
|\
| * Upgrade Sprockets to 2.1.0Guillermo Iguaran2011-11-141-1/+1
* | Sync CHANGELOGs from 3-1-stableJon Leighton2011-11-141-0/+11
* | 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
* | change tests to expect X-F-F over REMOTE_ADDRAndre Arko2011-11-131-2/+2
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-131-2/+2
|\ \
| * | Cosmetic fix in number_to_currency docsAlexey Vakhov2011-11-101-2/+2
* | | Merge pull request #3617 from indirect/remote_ipJosé Valim2011-11-132-53/+55
|\ \ \ | |_|/ |/| |
| * | defer calculating the remote IP until requestedAndre Arko2011-11-121-24/+36
| * | refactor RemoteIp middlewareAndre Arko2011-11-112-55/+45
* | | Unneeded require memoizableAkira Matsuda2011-11-121-2/+0
|/ /
* | Merge pull request #3613 from mitio/fix-actionpack-responder-docsXavier Noria2011-11-111-4/+4
|\ \
| * | Fix wording and minor typos in the Responder RDocDimitar Dimitrov2011-11-111-4/+4
* | | Merge pull request #3592 from avakhov/av-highlight-regexpJosé Valim2011-11-102-1/+5
|\ \ \
| * | | Fix and simplify highlight regexpAlexey Vakhov2011-11-102-1/+5
| | |/ | |/|
* | | Merge pull request #3581 from amatsuda/metal_response_body_19José Valim2011-11-102-1/+13
|\ \ \ | |/ / |/| |
| * | A test case to ensure that AC::Metal#response_body= always wraps the given va...Akira Matsuda2011-11-101-0/+6
| * | Fix AC::Metal#response_body= to store same value on Ruby 1.8 and 1.9Akira Matsuda2011-11-071-1/+7
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-082-13/+6
|\ \ \
| * | | Fix small typo in link_to_function docAlexey Vakhov2011-11-081-1/+1
| * | | Fixed stale doc in AbstractController::LayoutsDalibor Nasevic2011-11-061-12/+5
| |/ /
* | | Fix trouble using :subdomain in development environment when using numeri...Bradford Folkens2011-11-082-1/+12
* | | DrbStore removed from cache backendsIvan Evtukhovich2011-11-071-1/+0
* | | fix incorrect code exampleVijay Dev2011-11-071-1/+1
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-061-2/+2
|\ \
| * | Docs cosmetic fixes in Action View form_helper.rbAlexey Vakhov2011-11-061-2/+2
* | | RUBY_ENGINE is not defined on 1.8Jon Leighton2011-11-061-1/+1
* | | Implement a workaround for a bug in ruby-1.9.3p0.Jon Leighton2011-11-063-0/+39
* | | Revert "Skip test_default_external_works on the CI for Ruby 1.9.3."Jon Leighton2011-11-061-11/+0
* | | bumps up sprocketsXavier Noria2011-11-051-1/+1
* | | Skip test_default_external_works on the CI for Ruby 1.9.3.Jon Leighton2011-11-051-0/+11
|/ /
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-053-5/+7
|\ \
| * | Fix javascript_include_tag examples in documentationAlexey Vakhov2011-11-031-2/+2
| * | Fix small typos in routing docsAlexey Vakhov2011-11-031-1/+3
| * | Fix typo in Dispatcher#controller documentationAviv Ben-Yosef2011-11-011-1/+1
| * | Fix typo in constraints method documentationAlexey Vakhov2011-11-011-1/+1
* | | add tests for the case where size is explicitly passed to number_field helperVijay Dev2011-11-041-0/+4