aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10173 from nashby/element-attributesRafael Mendonça França2013-04-161-1/+1
|\
| * options_from_collection_for_select helper takes html attributesVasiliy Ermolovich2013-04-111-1/+1
* | replace match with get verb in ActionController::MetalGaurish Sharma2013-04-161-1/+1
* | make [] method in router more readablebuddhamagnet2013-04-151-1/+3
* | Fix a typoViktar Basharymau2013-04-121-1/+1
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-04-1136-78/+110
|\ \ | |/ |/|
| * improve accuracy of simple_format documentation. span doesn't get sanitized.RSL2013-04-091-2/+5
| * Typo fixCarson McDonald2013-04-051-3/+3
| * fix broken format in ActionView::Helpers::AssetTagHelper [ci skip]Francesco Rodriguez2013-04-041-4/+9
| * mark ActionView::Helpers::Tags as :nodoc: [ci skip]Francesco Rodriguez2013-04-0433-68/+67
| * fix broken format in ActionView::Helpers::NumberHelper [ci skip]Francesco Rodriguez2013-04-031-0/+25
| * Fix typoCarson McDonald2013-03-311-1/+1
* | Return nil for Mime::NullType#refAndrew White2013-04-102-1/+5
* | Reverts rendering behavior when format is unknownGrzegorz Świrski2013-04-102-2/+6
* | Use camelize instead of capitalize on error screenNikolay Shebanov2013-04-101-1/+1
* | Fix typoRafael Mendonça França2013-04-091-2/+2
* | Merge pull request #10148 from vipulnsward/traces_changeCarlos Antonio da Silva2013-04-091-6/+4
|\ \
| * | change array of array to hashVipul A M2013-04-091-6/+4
* | | fix AP warning; remove unused variableVipul A M2013-04-091-0/+1
|/ /
* | 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-081-0/+28
|\ \
| * | Exception handling for controllers using ActionController::LiveSean Griffin2013-03-181-0/+28
* | | 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
* | | | | Fix explicit names on multiple file fieldsRyan McGeary2013-04-051-8/+7
| |/ / / |/| | |
* | | | 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-041-3/+3
* | | | Merge pull request #10065 from spohlenz/mail_to_blockCarlos Antonio da Silva2013-04-041-5/+16
|\ \ \ \
| * | | | Add block support for the helperSam Pohlenz2013-04-031-5/+16
* | | | | 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