Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | adding start / finish on the instrumenter, adding tests for the class | Aaron Patterson | 2013-01-09 | 2 | -6/+67 |
| | |||||
* | Merge pull request #8859 from tehgeekmeister/master | Vijay Dev | 2013-01-09 | 1 | -2/+2 |
|\ | | | | | Fix a typo in a test. | ||||
| * | s/messqage/message/ in message_encryptor_test.rb | Ezekiel Smithburg | 2013-01-09 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #8848 from Irio/master | Carlos Antonio da Silva | 2013-01-09 | 1 | -1/+1 |
|\ \ | | | | | | | Set default value to ActiveModel::Validator initializer attribute | ||||
| * | | Set default value to ActiveModel::Validator initializer attribute | Irio Irineu Musskopf Junior | 2013-01-09 | 1 | -1/+1 |
| | | | | | | | | | | | | Makes it easier to test its objects. | ||||
* | | | Merge pull request #8849 from mattdbridges/contributing_to_rails | Carlos Antonio da Silva | 2013-01-09 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Adding mention about single-line blocks in Contributing to Rails [ci skip] | ||||
| * | | | adding small mention one single line blocks in contributing to rails | Matt Bridges | 2013-01-09 | 1 | -0/+1 |
|/ / / | | | | | | | | | | [ci skip] | ||||
* | | | Merge pull request #8839 from mattdbridges/clarify_chdir | Rafael Mendonça França | 2013-01-09 | 1 | -5/+5 |
|\ \ \ | |/ / |/| | | Clarify Dir.chdir definition | ||||
| * | | use multiline do-end blocks and rearrange definition for clarity | Matt Bridges | 2013-01-09 | 1 | -5/+5 |
| | | | |||||
* | | | Merge pull request #8842 from nthj/patch-1 | Rafael Mendonça França | 2013-01-09 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Fix typo in deprecation warning | ||||
| * | | Fix typo in deprecation warning | Nathaniel Jones | 2013-01-09 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #8824 from mjtko/fix/cookie-store-inheritance | Santiago Pastorino | 2013-01-08 | 2 | -5/+26 |
|\ \ | | | | | | | Modify CookieStore middleware inheritance to avoid subclassing Rack::Session::Cookie [Fix for #7372] | ||||
| * | | Revert cb3181e - no longer required. | Mark J. Titorenko | 2013-01-08 | 1 | -2/+0 |
| | | | |||||
| * | | Fix CookieStore middleware inheritance hierarchy s.t. it inherits from ↵ | Mark J. Titorenko | 2013-01-08 | 1 | -3/+26 |
| | | | | | | | | | | | | Rack::Session::Abstract::ID rather than Rack::Session::Cookie. | ||||
* | | | Merge pull request #8833 from diogomafra/release_notes | Carlos Antonio da Silva | 2013-01-08 | 1 | -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 Mafra | 2013-01-08 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #8823 from acapilleri/target_reflection_has_associated_record | Carlos Antonio da Silva | 2013-01-08 | 1 | -5/+1 |
|\ \ \ | | | | | | | | | Refactor target_reflection_has_associated_record? | ||||
| * | | | 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" |