aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Mark unused variables and make some style fixesAgis Anastasopoulos2013-04-089-13/+13
* Merge pull request #9604 from sgrif/live_streaming_exceptionsRafael Mendonça França2013-04-082-1/+103
|\
| * Exception handling for controllers using ActionController::LiveSean Griffin2013-03-182-1/+103
* | Merge pull request #10122 from wangjohn/adding_documentation_to_form_builderRafael Mendonça França2013-04-081-2/+55
|\ \
| * | Added documentation to the FormBuilder class, should helpwangjohn2013-04-061-2/+55
* | | Merge pull request #10130 from Agis-/patch-2Carlos Antonio da Silva2013-04-081-3/+3
|\ \ \
| * | | Remove unused block parametersAgis Anastasopoulos2013-04-071-3/+3
| |/ /
* / / Remove unecessary variable call, `#sort!` always returns an arrayAgis Anastasopoulos2013-04-071-1/+0
|/ /
* | Merge pull request #10101 from wangjohn/refactoring_routing_mapperAndrew White2013-04-061-12/+13
|\ \
| * | Refactoring some reused code into a method (inside of the routeswangjohn2013-04-051-12/+13
* | | change some more merge to merge! on new hashesVipul A M2013-04-061-3/+3
* | | Remove extra whitespaceAgis Anastasopoulos2013-04-061-4/+4
* | | Merge pull request #9555 from tmm1/optimize-erbRafael Mendonça França2013-04-052-3/+35
|\ \ \
| * | | avoid extra method calls for appending newlinesAman Gupta2013-03-041-1/+27
| * | | Use ActionView::OutputBuffer#safe_append= from templatesAman Gupta2013-03-042-3/+9
* | | | Improve the changelog entry [ci skip]Rafael Mendonça França2013-04-051-3/+4
* | | | Fix explicit names on multiple file fieldsRyan McGeary2013-04-053-8/+24
| |/ / |/| |
* | | Fix indent and remove extra white spacesCarlos Antonio da Silva2013-04-051-15/+17
* | | Refactor mail_to to not generate intermediate hashes when adding hrefCarlos Antonio da Silva2013-04-041-5/+6
* | | Ensure mail_to helper does not modify the given html options hashCarlos Antonio da Silva2013-04-042-4/+10
* | | Merge pull request #10065 from spohlenz/mail_to_blockCarlos Antonio da Silva2013-04-043-5/+30
|\ \ \
| * | | Add block support for the helperSam Pohlenz2013-04-033-5/+30
* | | | 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
|\ \ \ \ \ \ \