aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #3695 from tobiassvn/partial_path_errorYehuda Katz2011-11-192-2/+14
|\ \ \ \
| * | | | Meaningful errors for unexpected partial arguments. Fixes #3573Tobias Svensson2011-11-192-2/+14
* | | | | Don't html-escape the :count option to translate if it's a Numeric. Fixes #3685.Jon Leighton2011-11-193-2/+21
* | | | | Bump sprockets to 2.1.1Jon Leighton2011-11-191-1/+1
|/ / / /
* | | | Warning removed for shadowing variableArun Agrawal2011-11-191-1/+1
* | | | Revert "make sure to require the right deprecation warning file"Aaron Patterson2011-11-181-1/+0
* | | | Refactoring the redirect method for the router api.Aaron Patterson2011-11-182-25/+24
* | | | moving redirection to objectsAaron Patterson2011-11-181-45/+58
* | | | remove the :path feature to redirects, since it cannot workAaron Patterson2011-11-182-48/+7
* | | | make sure to require the right deprecation warning fileAaron Patterson2011-11-181-0/+1
* | | | arity check has been pushed up, so no need for proc wrappingAaron Patterson2011-11-181-1/+1
* | | | require that all blocks have arity of 2Aaron Patterson2011-11-182-6/+11
* | | | copy options keys to the right place so that undo will work correctlyAaron Patterson2011-11-181-10/+4
* | | | no need for type checkingAaron Patterson2011-11-181-1/+1
* | | | cleaning up variable names to match method parameter namesAaron Patterson2011-11-181-6/+8
* | | | stop doing is_a? checks on the resource typeAaron Patterson2011-11-181-4/+4
* | | | move constants to methods since nothing else is using themAaron Patterson2011-11-181-6/+5
* | | | pushing hash validation upAaron Patterson2011-11-181-13/+14
* | | | breaking match down to smaller methodsAaron Patterson2011-11-181-19/+22
* | | | some refactoring of the match methodAaron Patterson2011-11-181-25/+17
| |_|/ |/| |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-11-181-1/+2
|\ \ \
| * | | 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