aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Fix typo in view nameCarlos Antonio da Silva2013-04-032-1/+1
* Merge pull request #10074 from trevorturk/remove-fixme-comments-about-legacy-...Rafael Mendonça França2013-04-034-4/+0
|\
| * Remove comments about removing LegacyKeyGenerator in 4.1Trevor Turk2013-04-034-4/+0
* | Merge pull request #9932 from senny/9913_routing_problemAndrew White2013-04-032-8/+41
|\ \
| * | routing shorthand syntax works with multiple pathsYves Senn2013-03-262-5/+20
| * | bugfix, when matching multiple paths with `get`, `post`, ...Yves Senn2013-03-262-3/+21
* | | fix regression in Mapper when `format:` was used in a `scope`.Yves Senn2013-04-032-1/+23
* | | Fix grammatical error on JS helper warning messagethenickcox2013-04-021-2/+2
* | | Getting rid of a few other vestiges of rails.png.Steve Klabnik2013-04-021-0/+0
| |/ |/|
* | Merge pull request #10061 from trevorturk/dummy-key-generator-renameSantiago Pastorino2013-04-025-13/+13
|\ \
| * | Rename DummyKeyGenerator -> LegacyKeyGeneratorTrevor Turk2013-04-025-13/+13
* | | :scissors: spacing after privateTrevor Turk2013-04-021-3/+0
* | | Be consistent when talking about cookies, key -> nameTrevor Turk2013-04-021-25/+25
* | | Fix permanent cookie jar accessor typoTrevor Turk2013-04-022-2/+7
|/ /
* | Merge pull request #10054 from rubys/use_find_by_in_rdocSantiago Pastorino2013-04-023-4/+4
|\ \
| * | Prefer find_by over dynamic finders in rdocSam Ruby2013-04-023-4/+4
* | | each_with_index => each as we dont use indexVipul A M2013-04-031-1/+1
|/ /
* | Fixed typo on AP dispatch Mime::Type testKalabiYau2013-04-011-1/+1
* | Improve documentation around the cookie store auto-upgrade to encryptionTrevor Turk2013-04-011-22/+37
* | Merge pull request #9978 from trevorturk/cookie-store-auto-upgradeSantiago Pastorino2013-04-015-78/+162
|\ \
| * | Allow transparent upgrading of legacy signed cookies to encrypted cookies; Au...Trevor Turk2013-03-285-78/+162
* | | typo recomend -> recommendogawaso2013-04-011-2/+2
* | | Merge pull request #9680 from bdmac/time-zone-options-revert-grep-to-selectCarlos Antonio da Silva2013-03-312-4/+23
|\ \ \
| * | | Add regression test for TZ grepBrian McManus2013-03-271-0/+20
| * | | Revert grep to select since they are not the sameBrian McManus2013-03-272-4/+3
* | | | Merge pull request #10013 from vipulnsward/fix_request_method_testSantiago Pastorino2013-03-311-6/+2
|\ \ \ \
| * | | | fix request methods testVipul A M2013-03-311-6/+2
* | | | | Merge pull request #10015 from vipulnsward/remove_unused_variable_in_getSteve Klabnik2013-03-312-2/+2
|\ \ \ \ \
| * | | | | remove unused variable and assignmentVipul A M2013-03-312-2/+2
| |/ / / /
* | | | | Merge pull request #10014 from vipulnsward/remove_unused_match_varSteve Klabnik2013-03-311-8/+8
|\ \ \ \ \
| * | | | | remove unused match variables in selectorVipul A M2013-03-311-8/+8
| |/ / / /
* / / / / fix wrong argument error messageVipul A M2013-03-311-1/+1
|/ / / /
* | | | Improve AP changelog entry about layout method with nil returnCarlos Antonio da Silva2013-03-301-4/+4
* | | | Fix typos in AP: "overriden" => "overridden"Carlos Antonio da Silva2013-03-305-36/+36
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-306-84/+32
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix typoCarson McDonald2013-03-261-1/+1
| * | | Reverted code change introduced in d45145acdc576e46a1f1719d69bec96b5bf07b0aPrathamesh Sonpatki2013-03-242-2/+2
| * | | Changed 'args' to 'arguments' when used in places other than code with fixing...Prathamesh Sonpatki2013-03-242-2/+2
| * | | Remove duplicated accepts_nested_attributes descriptionma2gedev2013-03-221-16/+0
| * | | Undo bad change in cf0931166be13dbbe660Steve Klabnik2013-03-191-1/+1
| * | | Fixed small typosPrathamesh Sonpatki2013-03-192-2/+2
| * | | The HTTP method helpers are preferred over match and should be explained befo...Trevor Turk2013-03-181-28/+16
| * | | The default route has been removedTrevor Turk2013-03-181-24/+0
| * | | Using match without via is deprecatedTrevor Turk2013-03-181-12/+12
| * | | Capitalize the first letter of sentenceTatsuro Baba2013-03-181-1/+1
| * | | Remove :all from *args options in AbstractController.helperBryan Ricker2013-03-161-1/+1
* | | | Removed unused variable in procPrathamesh Sonpatki2013-03-281-1/+1
* | | | Merge pull request #9967 from choudhuryanupam/fix_actionpack_test_casesCarlos Antonio da Silva2013-03-282-3/+3
|\ \ \ \
| * | | | Refactored to remove unused variableAnupam Choudhury2013-03-282-3/+3
| | |/ / | |/| |
* / | | Fixed grammarAnupam Choudhury2013-03-281-1/+1
|/ / /