aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Avoid Rack security warning no secret providedSantiago Pastorino2013-01-081-0/+2
* | | Do not call fields_for from form_for, to avoid instantiating two buildersCarlos Antonio da Silva2013-01-061-8/+6
* | | Remove suggestion that Procs can be used as session secrets.James Coglan2013-01-051-7/+4
| |/ |/|
* | Merge pull request #8716 from miguelff/3-2-stableRafael Mendonça França2013-01-031-1/+1
|\ \
| * | Merge tag 'v3.2.10' into 3-2-stableMiguel2013-01-031-1/+1
| |\|
| | * bumping version to 3.2.10Aaron Patterson2012-12-231-1/+1
* | | Merge pull request #8719 from pcasaretto/fix-actionview-doc-typoCarlos Antonio da Silva2013-01-031-1/+1
|/ /
* | Backport #8701, do not append a second slash with `trailing_slash: true`Yves Senn2013-01-021-1/+5
* | fix block.arity raise nil error when not given a block to "content_tag_for"jasl2013-01-021-1/+3
* | Clear url helper methods when routes are reloadedAndrew White2012-12-141-6/+12
* | Merge pull request #8490 from mattv/fix_request_raw_postRafael Mendonça França2012-12-111-2/+3
* | Make distance_of_time_in_words work with DateTime offsetsAndrew White2012-12-041-2/+3
* | Make output of distance_of_time_in_words consistentAndrew White2012-12-041-2/+2
* | Override <%== to always behave as literal text rather than toggling based on ...Jeremy Kemper2012-12-031-0/+11
* | Merge pull request #8402 from senny/8376_descriptive_error_message_for_partia...Rafael Mendonça França2012-12-021-1/+1
* | Accept symbols as #send_data :disposition valueElia Schito2012-11-271-1/+1
* | Add i18n scope to disance_of_time_in_words.Steve Klabnik2012-11-261-3/+7
* | Refactor Generator class to not rely on in-place editing the controllerAndrew White2012-11-161-5/+10
* | Fix bug when url_for changes controller.Nikita Beloglazov2012-11-161-2/+2
* | Merge pull request #8235 from tilsammans/dont_escape_actionmailer_when_plaintextJosé Valim2012-11-161-0/+5
* | [ci skip] Correct examples for form_tag helper.DawidJanczak2012-11-141-2/+2
* | Merge branch '3-2-9' into 3-2-stableSantiago Pastorino2012-11-121-1/+1
|\|
| * Bump to 3.2.9Santiago Pastorino2012-11-121-1/+1
* | Merge branch '3-2-9' into 3-2-stableSantiago Pastorino2012-11-091-1/+1
|\|
| * Bump up to 3.2.9.rc3Santiago Pastorino2012-11-091-1/+1
* | Fix redirect example blockCarlos Antonio da Silva2012-11-091-3/+3
* | Merge pull request #8093 from nikitug/keep_app_x_ua_compatibleCarlos Antonio da Silva2012-11-081-1/+7
* | backport, handle trailing slash with enginesYves Senn2012-11-081-1/+1
* | Merge pull request #8108 from Casecommons/fix-multiple-and-index-in-instance-tagRafael Mendonça França2012-11-081-1/+3
|/
* Clear url helpers when reloading routesSantiago Pastorino2012-11-021-0/+1