aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ |/|
* | change useless gsub to trrobertomiranda2013-03-051-1/+1
* | change useless gsub to deleteBenjamin Sullivan2013-03-051-1/+1
|/
* Merge pull request #9366 from killthekitten/fix-content_for-regressionRafael Mendonça França2013-02-281-1/+1
|\
| * Fix #9360 regression in content_forNikolay Shebanov2013-02-251-1/+1
* | remove private attribute? warningFrancesco Rodriguez2013-02-261-1/+3
* | Merge pull request #8530 from dasch/dependency-trackersDavid Heinemeier Hansson2013-02-252-44/+98
|\ \
| * | Register trackers on extensions, not handlersDaniel Schierbeck2013-02-201-6/+11
| * | Rename ErbTracker to ERBTrackerDaniel Schierbeck2013-02-201-2/+2
| * | Return an empty array if no tracker is foundDaniel Schierbeck2013-02-201-2/+7
| * | Use a thread safe hashDaniel Schierbeck2013-02-201-1/+3
| * | Allow registering custom dependency trackersDaniel Schierbeck2013-02-201-1/+14
| * | Extract dependency tracking from DigestorDaniel Schierbeck2013-02-202-44/+73
* | | Fix debug helper not inspecting on ExceptionBouke van der Bijl2013-02-231-1/+1
* | | Merge pull request #9334 from NARKOZ/time_tagAndrew White2013-02-211-1/+3
|\ \ \
| * | | document setting custom datetime attribute for time_tag helperNihad Abbasov2013-02-221-0/+2
| * | | fix time_tag helper and update tests to not rely on dynamically generated valuesNihad Abbasov2013-02-221-1/+1
| |/ /
* | | completes pass over the AP changelog [ci skip]Xavier Noria2013-02-211-1/+1
* | | Revert "Revert "Merge pull request #4803 from lucascaton/master""Santiago Pastorino2013-02-211-2/+2
| |/ |/|
* | Use #grep to filter priority zones when a regexp is givenCarlos Antonio da Silva2013-02-211-1/+1
* | Use Array Difference to calculate the zones array, instead of iteratingCarlos Antonio da Silva2013-02-211-2/+2
* | Revert "Merge pull request #4803 from lucascaton/master"Santiago Pastorino2013-02-201-2/+2
|/
* Fix time_zone_options_for_select to not mutate TimeZones arrayBrian McManus2013-02-191-1/+1
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-02-152-3/+3
|\
| * Correct bullet content line wrappingTim "Roger" Harvey2013-02-121-1/+1
| * Fixing the examples for button_toMarc Baumbach2013-02-061-2/+2
* | Improve changelog entry from #9221 [ci skip]Carlos Antonio da Silva2013-02-111-3/+3
* | Improve img alt attribute for screen readersthenickcox2013-02-091-3/+17
* | partials inside directory work with `assert_template`Yves Senn2013-02-041-1/+1
* | descriptive `assert_template` error when partial wasn't renderedYves Senn2013-02-041-0/+4
|/
* Missing or unneeded require extract_optionsAkira Matsuda2013-02-013-1/+2
* Fix `content_tag_for` with array html option.Semyon Perepelitsa2013-01-311-1/+1