aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* Fix shorthand routes where controller and action are in the scopeAndrew White2013-06-251-0/+8
* Merge pull request #10971 from dtaniwaki/escape_link_to_unlessRafael Mendonça França2013-06-241-1/+1
* Compare host scheme using case-insensitive regexpRafael Mendonça França2013-06-161-1/+1
* Merge pull request #10478 from cainlevy/patch-1Rafael Mendonça França2013-05-061-1/+1
* Merging in fix from #8222Ben Tucker2013-05-061-1/+1
* just clear the caches on clear! rather than replacing. fixes #10251Aaron Patterson2013-04-171-8/+4
* Fix explicit names on multiple file fieldsRyan McGeary2013-04-051-8/+7
* Common behavior with adding formats to lookup_context for TemplateRenderer an...Dmitry Vorotilin2013-04-024-4/+16
* Fixed test failures on 1.8.7 caused by 74e59eaFred Wu2013-03-271-1/+1
* Backport #5808Mack Earnhardt2013-03-241-6/+21
* Merge branch '3-2-stable' into fredwu-slow_view_loading_fixAaron Patterson2013-03-201-1/+1
|\
| * Merge pull request #9802 from newsline/fix-broken-action-missingRafael Mendonça França2013-03-201-1/+1
* | Fixed assets loading performance in 3.2.13Fred Wu2013-03-201-1/+1
|/
* Backport #9347 to rails 3.2hoffm2013-03-191-1/+1
* Merge branch '3-2-13' into 3-2-stableAaron Patterson2013-03-182-6/+6
|\
| * bumping to 3.2.13Aaron Patterson2013-03-181-1/+1
| * 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 #9616 from exviva/multiple_select_name_double_square_bracketsCarlos Antonio da Silva2013-03-121-1/+1
| * bumping to rc2Aaron Patterson2013-03-061-1/+1
| * Preparing for 3.2.13.rc1 releaseSteve Klabnik2013-02-271-2/+2
* | do not freeze NumberHelper defaults.Yves Senn2013-03-181-2/+2
* | Extract hardcoded lists to Redo::RestaurantsListJuan Barreneche2013-03-141-1/+7
* | Merge pull request #9616 from exviva/multiple_select_name_double_square_bracketsCarlos Antonio da Silva2013-03-091-1/+1
* | Backport fixes about #7774 to 3-2-stablemaximerety2013-03-051-2/+2
* | remove unused path_without_format variableKornelius Kalnbach2013-03-031-2/+0
|/
* Check for `method_missing` in public and protectedPrem Sichanugrist2013-02-241-1/+2
* There is already a Set of non-hidden action_names lying around.thedarkone2013-02-241-8/+2
* determine the match shorthand target early.Yves Senn2013-02-221-9/+12
* Change tabs to spaces in form options helper [ci skip]Carlos Antonio da Silva2013-02-211-2/+2
* Merge branch '3-2-sec' into 3-2-stableAaron Patterson2013-02-111-1/+1
|\
| * bumping versionAaron Patterson2013-02-101-1/+1
* | Add another NumberHelper missing dependencyRodrigo Rosenfeld Rosas2013-01-291-0/+1
* | Add NumberHelper missing dependencyRodrigo Rosenfeld Rosas2013-01-291-0/+1
* | Duplicate possible frozen string from routeAndrew White2013-01-211-2/+3
* | Remove warning of not used variableCarlos Antonio da Silva2013-01-171-1/+1
* | Merge pull request #5288 from lest/patch-2José Valim2013-01-171-0/+2
* | fixes #8631 local inflections from interfereing with HTTP_METHOD_LOOKUP dispa...Aditya Sanghi2013-01-161-1/+6
* | Merge pull request #8914 from nilbus/fix-header-bloatRafael Mendonça França2013-01-151-1/+3
* | Merge pull request #8907 from rubys/masterRafael Mendonça França2013-01-121-1/+2
* | Remove unnecessary caching of ParameterFilterAndrew White2013-01-121-3/+1
* | Fix JSON params parsing regression for non-object JSON content.Dylan Smith2013-01-111-2/+2
* | Merge pull request #8756 from causes/js_include_tag_fixGuillermo Iguaran2013-01-101-9/+16
|\ \
| * | Fix javascript_include_tag when no js runtime is availableNoah Silas2013-01-071-9/+16
* | | Fixes issue where duplicate assets can be required with sprockets.jejacks0n2013-01-101-2/+2
* | | Merge branch '3-2-sec' into 3-2-secmergeAaron Patterson2013-01-083-9/+7
|\ \ \ | | |/ | |/|
| * | bumping versionAaron Patterson2013-01-081-1/+1
| * | * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealin...Aaron Patterson2013-01-082-8/+6
| * | Avoid Rack security warning no secret providedSantiago Pastorino2013-01-081-0/+2
* | | Merge pull request #8812 from rubys/masterCarlos Antonio da Silva2013-01-081-1/+1