Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #8869 from goshakkk/guides-asset-pipeline-tilt | Guillermo Iguaran | 2013-01-10 | 1 | -1/+25 | |
|\ \ \ \ | | | | | | | | | | | Add asset pipeline guides section on implementing & registering own engines | |||||
| * | | | | add asset pipeline guides section on implementing & registering own engines | Gosha Arinich | 2013-01-10 | 1 | -1/+25 | |
| | | | | | ||||||
* | | | | | Relax bundler dep until 1.3.0 is actually released. | Jeremy Kemper | 2013-01-10 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Bump bundler dep to 1.3.0.pre.4+ to introduce 'bundle binstubs <gem>'" This reverts commit e00b8ecf1ad8984b760f12e61247820613aec4ee. Revert "Use bundler --pre for travis builds" This reverts commit 4d240ec20a70122b7e69c790a37d2be14e1ff038. | |||||
* | | | | | Include jbuilder by default and rely on its scaffold generator to show json ↵ | David Heinemeier Hansson | 2013-01-10 | 6 | -99/+14 | |
| | | | | | | | | | | | | | | | | | | | | API. The default scaffold will now just create HTML if the user actively opts out of jbuilder | |||||
* | | | | | Merge pull request #8878 from senny/add_performance_test_extraction_to_guide | Guillermo Iguaran | 2013-01-10 | 1 | -0/+1 | |
|\ \ \ \ \ | | | | | | | | | | | | | Mention performance test extraction in 4.0 guide | |||||
| * | | | | | mention performance test extraction in 4.0 guide | Yves Senn | 2013-01-10 | 1 | -0/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #8876 from senny/extract_performance_tests | Guillermo Iguaran | 2013-01-10 | 33 | -1640/+20 | |
|\ \ \ \ \ | | | | | | | | | | | | | Extract ActionDispatch::PerformanceTest | |||||
| * | | | | | remove the rails guide on performance testing | Yves Senn | 2013-01-10 | 3 | -692/+0 | |
| | | | | | | ||||||
| * | | | | | remove performance tests from the default stack | Yves Senn | 2013-01-10 | 10 | -47/+5 | |
| | | | | | | ||||||
| * | | | | | extract PerformanceTest into rails-performance_tests gem | Yves Senn | 2013-01-10 | 21 | -901/+15 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge pull request #8821 from jamis/master | Rafael Mendonça França | 2013-01-10 | 2 | -7/+3 | |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Evaluate view_cache_dependencies at the instance level Conflicts: actionpack/lib/action_controller/caching.rb | |||||
| * | | | | evaluate the dependency blocks at the instance level, not class level | Jamis Buck | 2013-01-08 | 2 | -7/+3 | |
| | | | | | ||||||
* | | | | | Merge pull request #8863 from zires/dev | Carlos Antonio da Silva | 2013-01-10 | 1 | -1/+1 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | Remove redundant double quotation marks [ci skip] | |||||
| * | | | | Remove redundant double quotation marks | zires | 2013-01-10 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | fire a notification when the request stops / starts | Aaron Patterson | 2013-01-09 | 2 | -2/+88 | |
| | | | | ||||||
* | | | | adding missing requires | Aaron Patterson | 2013-01-09 | 3 | -1/+12 | |
| | | | | ||||||
* | | | | extract logger and development checks to methods | Aaron Patterson | 2013-01-09 | 1 | -6/+16 | |
| | | | | ||||||
* | | | | 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 |