aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
...
| * | | put back the removed egVijay Dev2011-11-181-0/+1
| * | | Fix a number_with_delimiter :separator exampleEdward Anderson2011-11-171-1/+1
* | | | _html translation should escape interpolated argumentslest2011-11-173-4/+29
* | | | Revert "warn the user values are directly interpolated into _html translation...Xavier Noria2011-11-171-2/+0
* | | | warn the user values are directly interpolated into _html translation stringsXavier Noria2011-11-171-0/+2
* | | | Merge pull request #3654 from wildchild/label_i18nJosé Valim2011-11-172-1/+55
|\ \ \ \
| * | | | Fix impractical I18n lookup in nested fields_forAlexander Uvarov2011-11-172-1/+55
* | | | | It should be @calculated_ip not @calculate_ipArun Agrawal2011-11-171-1/+1
|/ / / /
* | | | Initialize our instance variables.Aaron Patterson2011-11-161-1/+3
* | | | Merge pull request #3649 from indirect/remote_ipAaron Patterson2011-11-162-5/+7
|\ \ \ \
| * | | | 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
* | | | | 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.Olivier Lacan2011-11-031-0/+1
* | | | | 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
|\ \ \ \ \