aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
...
* | 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
* Revert "Merge pull request #7668 from Draiken/fix_issue_6497"Rafael Mendonça França2012-11-021-1/+1
* Bump to 3.2.9.rc2Santiago Pastorino2012-11-011-1/+1
* Revert "Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased"Rafael Mendonça França2012-10-311-13/+6
* Revert "Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_va...Rafael Mendonça França2012-10-302-23/+23
* Bump to 3.2.9.rc1Santiago Pastorino2012-10-291-2/+2
* Accept :remote as symbol in link_to optionsRiley2012-10-061-1/+3
* Merge pull request #7848 from senny/3415_assert_template_has_nil_variableRafael Mendonça França2012-10-061-3/+7
* Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_variablesRafael Mendonça França2012-10-012-23/+23
* Merge pull request #7789 from senny/7777_resource_functions_modify_optionsRafael Mendonça França2012-10-011-2/+2
* Since File instance doesn't respond to #open use a double to test theRafael Mendonça França2012-09-301-1/+1
* Asset manifest includes aliases for foo.js -> foo/index.js and vice versa. Bu...Jeremy Kemper2012-09-301-20/+12