aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Duplicate possible frozen string from routeAndrew White2013-01-212-2/+10
* Remove warning of not used variableCarlos Antonio da Silva2013-01-171-1/+1
* Do not run this streaming test in Ruby 1.8, fix syntax errorCarlos Antonio da Silva2013-01-171-5/+8
* Merge pull request #5288 from lest/patch-2José Valim2013-01-173-0/+21
* fixes #8631 local inflections from interfereing with HTTP_METHOD_LOOKUP dispa...Aditya Sanghi2013-01-163-1/+32
* Merge pull request #8914 from nilbus/fix-header-bloatRafael Mendonça França2013-01-153-2/+10
* 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-113-2/+13
* Reorder AP changelog and remove duplicated entry [ci skip]Carlos Antonio da Silva2013-01-101-11/+9
* Merge pull request #8756 from causes/js_include_tag_fixGuillermo Iguaran2013-01-103-9/+28
|\
| * Fix javascript_include_tag when no js runtime is availableNoah Silas2013-01-073-9/+28
* | Fixes issue where duplicate assets can be required with sprockets.jejacks0n2013-01-105-2/+16
* | Update changelogs with release date [ci skip]Carlos Antonio da Silva2013-01-091-2/+4
* | Merge branch '3-2-sec' into 3-2-secmergeAaron Patterson2013-01-087-11/+57
|\ \
| * | bumping versionAaron Patterson2013-01-081-1/+1
| * | CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml.Jeremy Kemper2013-01-081-0/+13
| * | * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealin...Aaron Patterson2013-01-085-8/+42
| * | Avoid Rack security warning no secret providedSantiago Pastorino2013-01-081-0/+2
* | | Changelog improvements [ci skip]Carlos Antonio da Silva2013-01-081-6/+5
* | | Bump rack dependency to 1.4.3Carlos Antonio da Silva2013-01-082-1/+5
* | | 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-062-9/+19
* | | Remove suggestion that Procs can be used as session secrets.James Coglan2013-01-051-7/+4
* | | backport #4f0f1b5 into 3-2-stable. because 1.9.3-p362 warned unused variables.SHIBATA Hiroshi2013-01-051-1/+2
| |/ |/|
* | 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
|/ /
* | Use Ruby 1.8 syntaxRafael Mendonça França2013-01-021-2/+2
* | Backport #8701, do not append a second slash with `trailing_slash: true`Yves Senn2013-01-023-6/+33
* | Add release date of 3.2.10Rafael Mendonça França2013-01-021-1/+5
* | Improve CHANGELOG message [ci skip]Rafael Mendonça França2013-01-021-3/+2
* | Merge branch '3-2-stable' into 3-2-secmergeAaron Patterson2013-01-023-1/+16
|\ \
| * | fix block.arity raise nil error when not given a block to "content_tag_for"jasl2013-01-023-1/+16
* | | Merge branch '3-2-sec' into 3-2-secmergeAaron Patterson2012-12-231-1/+3
|\ \ \ | |/ / |/| / | |/
| * updating the changelogsAaron Patterson2012-12-231-0/+2
| * Add release date of Rails 3.2.9 to documentationclaudiob2012-12-231-1/+1
* | Don't use 1.9 hash syntax on 3-2-stableAndrew White2012-12-141-8/+8
* | Clear url helper methods when routes are reloadedAndrew White2012-12-143-6/+104
* | Merge pull request #8490 from mattv/fix_request_raw_postRafael Mendonça França2012-12-113-2/+15
* | Make distance_of_time_in_words work with DateTime offsetsAndrew White2012-12-042-2/+13
* | Make output of distance_of_time_in_words consistentAndrew White2012-12-042-4/+21
* | Use 1.8 hash styleCarlos Antonio da Silva2012-12-031-1/+1
* | Override <%== to always behave as literal text rather than toggling based on ...Jeremy Kemper2012-12-033-4/+21
* | Merge pull request #8402 from senny/8376_descriptive_error_message_for_partia...Rafael Mendonça França2012-12-023-2/+17
* | Accept symbols as #send_data :disposition valueElia Schito2012-11-273-2/+16
* | @steveklabnik can't spell 'distance.'Steve Klabnik2012-11-261-1/+1
* | Add i18n scope to disance_of_time_in_words.Steve Klabnik2012-11-263-7/+21