Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | target_reflection_has_associated_record? refactoring | Angelo Capilleri | 2013-01-08 | 1 | -5/+1 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #8826 from acapilleri/different_target | Carlos Antonio da Silva | 2013-01-08 | 1 | -2/+5 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Improved different_target conditions | |||||
| * | | | | | | | improved different_target conditions | Angelo Capilleri | 2013-01-08 | 1 | -2/+5 | |
| |/ / / / / / | ||||||
* | | | | | | | Remove :yaml related tests and fix other related to parsing empty arrays | Carlos Antonio da Silva | 2013-01-08 | 2 | -45/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | All Action Pack tests are green. | |||||
* | | | | | | | Fix warning: & interpreted as argument prefix | Carlos Antonio da Silva | 2013-01-08 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Fix syntax error and remove duplicated test | Carlos Antonio da Silva | 2013-01-08 | 1 | -6/+4 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #8827 from sikachu/master-remove-yaml-changelog | Aaron Patterson | 2013-01-08 | 1 | -1/+5 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add CHANGELOG entry for YAML parsing removal | |||||
| * | | | | | | | Add CHANGELOG entry for YAML parsing removal | Prem Sichanugrist | 2013-01-08 | 1 | -1/+5 | |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | This is for commit e80546cdec56a9c3fcaf6217cba08a02d789d2bc. | |||||
* | | | | | | | remove yaml as a param parser :burn: | Aaron Patterson | 2013-01-08 | 1 | -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 file | Xavier Noria | 2013-01-08 | 2 | -4/+4 | |
| | | | | | | | ||||||
* | | | | | | | CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. | Jeremy Kemper | 2013-01-08 | 4 | -10/+65 | |
| | | | | | | | ||||||
* | | | | | | | * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * ↵ | Aaron Patterson | 2013-01-08 | 5 | -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 Kemper | 2013-01-08 | 9 | -109/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 88cc1688d0cb828c17706b41a8bd27870f2a2beb, reversing changes made to f049016cd348627bf8db0d72382d7580bf802a79. | |||||
* | | | | | | | Merge branch 'master-sec' | Aaron Patterson | 2013-01-08 | 9 | -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 Kemper | 2013-01-08 | 4 | -10/+65 | |
| | | | | | | | | ||||||
| * | | | | | | | * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * ↵ | Aaron Patterson | 2013-01-07 | 5 | -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/docrails | Vijay Dev | 2013-01-09 | 47 | -329/+167 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/getting_started.md | |||||
| * | | | | | | | | Correct method notation for #acts_like? [ci skip] | Doug Yun | 2013-01-07 | 1 | -4/+4 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Instance_variable_names are strings. That is the most important information IMO | Akira Matsuda | 2013-01-08 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | more woring improvements to the engines guide | Gosha Arinich | 2013-01-07 | 1 | -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 guide | Gosha Arinich | 2013-01-07 | 1 | -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 Arinich | 2013-01-07 | 12 | -15/+15 | |
| | | | | | | | | | ||||||
| * | | | | | | | | The plural of apparatus is apparatuses | Tim Raymond | 2013-01-05 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | HTTP 302 means Found, not Moved | Chase DuBois | 2013-01-05 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | wrap terminal prompt marks in a pre tag | Gosha Arinich | 2013-01-05 | 1 | -1/+3 | |
| | | | | | | | | | ||||||
| * | | | | | | | | proper article in the getting started guide | Gosha Arinich | 2013-01-05 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Rename raise_on_unexpected_params to raise_on_unpermitted_parameters on the ↵ | Rafael Mendonça França | 2013-01-05 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | guides | |||||
| * | | | | | | | | Fix typo | Rafael Mendonça França | 2013-01-05 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | beginrescueend has ended | Akira Matsuda | 2013-01-05 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Document new configuration option action_controller.raise_on_unexpected_params. | Thomas Drake-Brockman | 2013-01-05 | 1 | -0/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | undecorated_table_name was moved and refactored | Akira Matsuda | 2013-01-04 | 1 | -3/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Ruby 1.8 support had gone | Akira Matsuda | 2013-01-04 | 1 | -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" section | Akira Matsuda | 2013-01-04 | 1 | -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 config | Akira Matsuda | 2013-01-04 | 1 | -5/+11 | |
| | | | | | | | | | ||||||
| * | | | | | | | | extract alert= and notice= examples to FlashHash#now [ci skip] | Francesco Rodriguez | 2013-01-03 | 1 | -17/+15 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Readd deleted section of caching rails guide | Matthew Stopa | 2013-01-03 | 1 | -0/+69 | |
| | | | | | | | | | ||||||
| * | | | | | | | | A Relation is not a collection of records. So let's not use the term "record" | Akira Matsuda | 2013-01-04 | 1 | -2/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Revert "TODO typo fix" | Akira Matsuda | 2013-01-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1a59a6dfdca217e31a52779d92aa56b67c6689cb. I guess it's not a typo: https://github.com/jorlhuda/exceptron | |||||
| * | | | | | | | | TODO typo fix | Gosha Arinich | 2013-01-04 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Add examples `alert=` and `notice=`, using memes | lambda_ | 2013-01-03 | 1 | -0/+10 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Change `Example for` to `Example of` | lambda_ | 2013-01-03 | 1 | -2/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | we don't have public/index.html anymore | Akira Matsuda | 2013-01-04 | 1 | -4/+3 | |
| | | | | | | | | | ||||||
| * | | | | | | | | update the scaffold generator outputs | Akira Matsuda | 2013-01-04 | 2 | -5/+16 | |
| | | | | | | | | | ||||||
| * | | | | | | | | .all does not return an Array | Akira Matsuda | 2013-01-04 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | deliver_ is an old API | Akira Matsuda | 2013-01-04 | 1 | -6/+6 | |
| | | | | | | | | | ||||||
| * | | | | | | | | `Model.all` alone does nothing | Akira Matsuda | 2013-01-04 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | remove meaningless use of Relation#all | Akira Matsuda | 2013-01-03 | 3 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | particularly, `all(options)` would warn | |||||
| * | | | | | | | | PUT => PATCH | Akira Matsuda | 2013-01-03 | 3 | -6/+6 | |
| | | | | | | | | | ||||||
| * | | | | | | | | let's get started with PATCH method rather than PUT | Akira Matsuda | 2013-01-03 | 1 | -5/+5 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Remove action/page caching from Rails guides | Matthew Stopa | 2013-01-02 | 1 | -163/+2 | |
| | | | | | | | | |