aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #8824 from mjtko/fix/cookie-store-inheritanceSantiago Pastorino2013-01-082-5/+26
|\
| * Revert cb3181e - no longer required.Mark J. Titorenko2013-01-081-2/+0
| * Fix CookieStore middleware inheritance hierarchy s.t. it inherits from Rack::...Mark J. Titorenko2013-01-081-3/+26
* | Merge pull request #8833 from diogomafra/release_notesCarlos Antonio da Silva2013-01-081-1/+1
|\ \
| * | Correcting the command 'rake rails:update:bin' in the release notes.[ci skip]Diogo Mafra2013-01-081-1/+1
|/ /
* | Merge pull request #8823 from acapilleri/target_reflection_has_associated_recordCarlos Antonio da Silva2013-01-081-5/+1
|\ \
| * | target_reflection_has_associated_record? refactoringAngelo Capilleri2013-01-081-5/+1
* | | Merge pull request #8826 from acapilleri/different_targetCarlos Antonio da Silva2013-01-081-2/+5
|\ \ \
| * | | improved different_target conditionsAngelo Capilleri2013-01-081-2/+5
| |/ /
* | | Remove :yaml related tests and fix other related to parsing empty arraysCarlos Antonio da Silva2013-01-082-45/+2
* | | Fix warning: & interpreted as argument prefixCarlos Antonio da Silva2013-01-081-1/+1
* | | Fix syntax error and remove duplicated testCarlos Antonio da Silva2013-01-081-6/+4
* | | Merge pull request #8827 from sikachu/master-remove-yaml-changelogAaron Patterson2013-01-081-1/+5
|\ \ \
| * | | Add CHANGELOG entry for YAML parsing removalPrem Sichanugrist2013-01-081-1/+5
|/ / /
* | | remove yaml as a param parser :burn:Aaron Patterson2013-01-081-2/+0
* | | mv README README.rdoc as app template fileXavier Noria2013-01-082-4/+4
* | | CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml.Jeremy Kemper2013-01-084-10/+65
* | | * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealin...Aaron Patterson2013-01-085-5/+44
* | | Revert "Merge branch 'master-sec'"Jeremy Kemper2013-01-089-109/+15
* | | Merge branch 'master-sec'Aaron Patterson2013-01-089-15/+109
|\ \ \
| * | | CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml.Jeremy Kemper2013-01-084-10/+65
| * | | * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealin...Aaron Patterson2013-01-075-5/+44
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-01-0947-329/+167
|\ \ \ \
| * | | | Correct method notation for #acts_like? [ci skip]Doug Yun2013-01-071-4/+4
| * | | | Instance_variable_names are strings. That is the most important information IMOAkira Matsuda2013-01-081-1/+1
| * | | | more woring improvements to the engines guideGosha Arinich2013-01-071-2/+2
| * | | | improve wording of the engines guideGosha Arinich2013-01-071-5/+7
| * | | | prefer american spelling of 'behavior'Gosha Arinich2013-01-0712-15/+15
| * | | | The plural of apparatus is apparatusesTim Raymond2013-01-051-1/+1
| * | | | HTTP 302 means Found, not MovedChase DuBois2013-01-051-1/+1
| * | | | wrap terminal prompt marks in a pre tagGosha Arinich2013-01-051-1/+3
| * | | | proper article in the getting started guideGosha Arinich2013-01-051-1/+1
| * | | | Rename raise_on_unexpected_params to raise_on_unpermitted_parameters on the g...Rafael Mendonça França2013-01-051-1/+1
| * | | | Fix typoRafael Mendonça França2013-01-051-1/+1
| * | | | beginrescueend has endedAkira Matsuda2013-01-051-1/+1
| * | | | Document new configuration option action_controller.raise_on_unexpected_params.Thomas Drake-Brockman2013-01-051-0/+2
| * | | | undecorated_table_name was moved and refactoredAkira Matsuda2013-01-041-3/+2
| * | | | Ruby 1.8 support had goneAkira Matsuda2013-01-041-18/+0
| * | | | get rid of outdated "`server` with Different Backends" sectionAkira Matsuda2013-01-041-25/+0
| * | | | update the example of generated postgresql configAkira Matsuda2013-01-041-5/+11
| * | | | extract alert= and notice= examples to FlashHash#now [ci skip]Francesco Rodriguez2013-01-031-17/+15
| * | | | Readd deleted section of caching rails guideMatthew Stopa2013-01-031-0/+69
| * | | | A Relation is not a collection of records. So let's not use the term "record"Akira Matsuda2013-01-041-2/+2
| * | | | Revert "TODO typo fix"Akira Matsuda2013-01-041-1/+1
| * | | | TODO typo fixGosha Arinich2013-01-041-1/+1
| * | | | Add examples `alert=` and `notice=`, using memeslambda_2013-01-031-0/+10
| * | | | Change `Example for` to `Example of`lambda_2013-01-031-2/+2
| * | | | we don't have public/index.html anymoreAkira Matsuda2013-01-041-4/+3
| * | | | update the scaffold generator outputsAkira Matsuda2013-01-042-5/+16
| * | | | .all does not return an ArrayAkira Matsuda2013-01-041-1/+1