aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #8824 from mjtko/fix/cookie-store-inheritanceSantiago Pastorino2013-01-082-5/+26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Modify CookieStore middleware inheritance to avoid subclassing Rack::Session::Cookie [Fix for #7372]
| * | | | | | | | Revert cb3181e - no longer required.Mark J. Titorenko2013-01-081-2/+0
| | | | | | | | |
| * | | | | | | | Fix CookieStore middleware inheritance hierarchy s.t. it inherits from ↵Mark J. Titorenko2013-01-081-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rack::Session::Abstract::ID rather than Rack::Session::Cookie.
* | | | | | | | | 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]
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor target_reflection_has_associated_record?
| * | | | | | | | | 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 conditions
| * | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All Action Pack tests are green.
* | | | | | | | | | 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 removal
| * | | | | | | | | | Add CHANGELOG entry for YAML parsing removalPrem Sichanugrist2013-01-081-1/+5
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is for commit e80546cdec56a9c3fcaf6217cba08a02d789d2bc.
* | | | | | | | | | remove yaml as a param parser :burn:Aaron Patterson2013-01-081-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you revert this commit, I will hunt you down, I will make you regret ever terrible thing you've ever done, I will make you suffer.
* | | | | | | | | | 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] * ↵Aaron Patterson2013-01-085-5/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dealing with empty hashes. Thanks Damien Mathieu Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_dispatch/middleware/params_parser.rb activerecord/CHANGELOG.md activerecord/lib/active_record/relation/predicate_builder.rb activerecord/test/cases/relation/where_test.rb
* | | | | | | | | | Revert "Merge branch 'master-sec'"Jeremy Kemper2013-01-089-109/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 88cc1688d0cb828c17706b41a8bd27870f2a2beb, reversing changes made to f049016cd348627bf8db0d72382d7580bf802a79.
* | | | | | | | | | Merge branch 'master-sec'Aaron Patterson2013-01-089-15/+109
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master-sec: CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu
| * | | | | | | | | 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] * ↵Aaron Patterson2013-01-075-5/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dealing with empty hashes. Thanks Damien Mathieu Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_dispatch/middleware/params_parser.rb activerecord/CHANGELOG.md activerecord/lib/active_record/relation/predicate_builder.rb activerecord/test/cases/relation/where_test.rb
* | | | | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-01-0947-329/+167
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/getting_started.md
| * | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * "also in ... is ..." -> "in .. there is ..." * use "as well" instead of "also" in the end of the sentence * "has the ability" -> "can"
| * | | | | | | | | | improve wording of the engines guideGosha Arinich2013-01-071-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * "very minor" -> "subtle" * reword successive sentences so that they don't begin with the same word ("this") * "also" is not used in the end of the sentence, use "as well" instead * "the reason is because" -> "the reason is that"
| * | | | | | | | | | 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 ↵Rafael Mendonça França2013-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | guides
| * | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instance_variable_names remains for internal use, but it's not that useful for the users anymore
| * | | | | | | | | | get rid of outdated "`server` with Different Backends" sectionAkira Matsuda2013-01-041-25/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * I don't think people are running Rails under mongrel today * it's better not to sudo gem install * basically all we need to do is just bundle the server. No need to give its name as a parameter * I could write ^^^, but I realized that it's not really about "command line"
| * | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1a59a6dfdca217e31a52779d92aa56b67c6689cb. I guess it's not a typo: https://github.com/jorlhuda/exceptron
| * | | | | | | | | | 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
| | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-21 18:40:55 +0000