aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge pull request #10337 from eimermusic/fix_template_digestor_lookup"Rafael Mendonça França2013-04-251-1/+1
* AV Digestor correctly passes format to LookupContextMartin Westin2013-04-251-1/+1
* Merge pull request #10267 from vipulnsward/use_destructive_methodRafael Mendonça França2013-04-191-1/+1
|\
| * symbolize_keys => symbolize_keys! on new hash;Vipul A M2013-04-191-1/+1
* | Adding documentation to actionview so that the big picture of thewangjohn2013-04-184-0/+41
|/
* 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
* | 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
* | Added documentation to the FormBuilder class, should helpwangjohn2013-04-061-2/+55
* | change some more merge to merge! on new hashesVipul A M2013-04-061-3/+3
* | 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
* | | Add block support for the helperSam Pohlenz2013-04-031-5/+16
* | | Fix grammatical error on JS helper warning messagethenickcox2013-04-021-2/+2
* | | 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
| | |_|/ | |/| |
* / | | remove unused match variables in selectorVipul A M2013-03-311-8/+8
|/ / /
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-302-17/+1
|\ \ \ | |/ / |/| |
| * | Fix typoCarson McDonald2013-03-261-1/+1
| * | Remove duplicated accepts_nested_attributes descriptionma2gedev2013-03-221-16/+0
* | | Merge branch 'master-sec'Aaron Patterson2013-03-181-5/+5
|\ \ \
| * | | fix protocol checking in sanitization [CVE-2013-1857]Aaron Patterson2013-03-151-2/+2
| * | | fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855]Charlie Somerville2013-03-151-3/+3
* | | | Merge pull request #9753 from jbarreneche/bug/render-locale-fallbacksCarlos Antonio da Silva2013-03-181-1/+7
|\ \ \ \
| * | | | Include I18n fallbacks in :locale lookup contextJuan Barreneche2013-03-161-1/+7
| | |/ / | |/| |
* | | | Merge pull request #9754 from macksmind/fix_actionpack_warningsRafael Mendonça França2013-03-171-1/+2
|\ \ \ \
| * | | | Fix rake test warnings in actionpackMack Earnhardt2013-03-171-1/+2
| |/ / /
* / / / Allow pass multipart option to form_forGrzegorz Derebecki2013-03-171-1/+1
|/ / /
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-101-1/+1
|\ \ \
| * | | Update capture_helper.rbJess Brown2013-03-061-1/+1
| |/ /
* | | Fix incorrectly appended square brackets to a multiple select boxOlek Janiszewski2013-03-081-1/+1
* | | Fix hash spaces and use 1.9 style hash [ci skip]Carlos Antonio da Silva2013-03-071-1/+1
* | | Merge pull request #9464 from jcoyne/assert_template_fileRafael Mendonça França2013-03-072-1/+2
|\ \ \
| * | | Allow use of assert_template with the :file option.Justin Coyne2013-03-012-1/+2
| | |/ | |/|
* | | Typo in comment to ActionView::Resolver#find_allRKushnir2013-03-061-1/+1
* | | Use gsub intead of tr when the to_str is longer than the from_strrobertomiranda2013-03-051-1/+1
| |/ |/|