aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9932 from senny/9913_routing_problemAndrew White2013-04-031-8/+12
|\
| * routing shorthand syntax works with multiple pathsYves Senn2013-03-261-5/+6
| * bugfix, when matching multiple paths with `get`, `post`, ...Yves Senn2013-03-261-3/+6
* | fix regression in Mapper when `format:` was used in a `scope`.Yves Senn2013-04-031-1/+1
* | Fix grammatical error on JS helper warning messagethenickcox2013-04-021-2/+2
* | Merge pull request #10061 from trevorturk/dummy-key-generator-renameSantiago Pastorino2013-04-021-1/+1
|\ \
| * | Rename DummyKeyGenerator -> LegacyKeyGeneratorTrevor Turk2013-04-021-1/+1
* | | :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-021-1/+1
|/ /
* | Prefer find_by over dynamic finders in rdocSam Ruby2013-04-023-4/+4
* | 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-013-76/+78
|\ \
| * | Allow transparent upgrading of legacy signed cookies to encrypted cookies; Au...Trevor Turk2013-03-283-76/+78
* | | typo recomend -> recommendogawaso2013-04-011-2/+2
* | | Merge pull request #9680 from bdmac/time-zone-options-revert-grep-to-selectCarlos Antonio da Silva2013-03-311-1/+1
|\ \ \
| * | | Revert grep to select since they are not the sameBrian McManus2013-03-271-1/+1
* | | | Merge pull request #10015 from vipulnsward/remove_unused_variable_in_getSteve Klabnik2013-03-311-1/+1
|\ \ \ \
| * | | | remove unused variable and assignmentVipul A M2013-03-311-1/+1
* | | | | 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
|/ / / /
* | | | Fix typos in AP: "overriden" => "overridden"Carlos Antonio da Silva2013-03-301-1/+1
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-306-84/+32
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix typoCarson McDonald2013-03-261-1/+1
| * | | 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
* | | | Fixed grammarAnupam Choudhury2013-03-281-1/+1
| |/ / |/| |
* | | Merge pull request #8458 from lucisferre/improve-layout-override-fallback-beh...Rafael Mendonça França2013-03-271-5/+9
|\ \ \ | |_|/ |/| |
| * | Provides standard layout lookup behavior for method and proc casesChris Nicola2013-03-271-5/+9
* | | if cookie is tampered with then nil is returned [ci skip]Neeraj Singh2013-03-251-4/+2
* | | Introduce UpgradeLegacySignedCookieJar to transparently upgrade existing sign...Trevor Turk2013-03-241-99/+99
* | | Merge pull request #9704 from trevorturk/warn-about-skipped-routesJeremy Kemper2013-03-241-1/+9
|\ \ \
| * | | Tweak exception message to avoid giving potentially misleading suggestionsTrevor Turk2013-03-201-2/+3
| * | | Raise an ArgumentError when a clashing named route is definedTrevor Turk2013-03-191-1/+8
* | | | Fix some typosVipul A M2013-03-242-2/+2
* | | | Merge pull request #8501 from charliesome/version-to-sRafael Mendonça França2013-03-231-6/+7
|\ \ \ \
| * | | | Add version method to top level modulesCharlie Somerville2013-03-211-6/+7
* | | | | Fix documentation markup [ci skip]Rafael Mendonça França2013-03-231-0/+2
* | | | | StringIO is not required by default in JRubyArun Agrawal2013-03-221-0/+1
|/ / / /
* | | | Merge pull request #9802 from newsline/fix-broken-action-missingRafael Mendonça França2013-03-201-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix broken ActionController#action_missingJanko Luin2013-03-201-1/+1
* | | | Merge pull request #9794 from schneems/schneems/email-hostAndrew White2013-03-191-1/+12
|\ \ \ \
| * | | | Fix improperly configured host in generated urlsschneems2013-03-191-1/+12
| |/ / /