aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | extract PerformanceTest into rails-performance_tests gemYves Senn2013-01-1021-901/+15
| | |_|_|/ | |/| | |
* | | | | Merge pull request #8821 from jamis/masterRafael Mendonça França2013-01-102-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 levelJamis Buck2013-01-082-7/+3
| | | | |
* | | | | Merge pull request #8863 from zires/devCarlos Antonio da Silva2013-01-101-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Remove redundant double quotation marks [ci skip]
| * | | | Remove redundant double quotation markszires2013-01-101-1/+1
|/ / / /
* | | | fire a notification when the request stops / startsAaron Patterson2013-01-092-2/+88
| | | |
* | | | adding missing requiresAaron Patterson2013-01-093-1/+12
| | | |
* | | | extract logger and development checks to methodsAaron Patterson2013-01-091-6/+16
| | | |
* | | | adding start / finish on the instrumenter, adding tests for the classAaron Patterson2013-01-092-6/+67
| | | |
* | | | Merge pull request #8859 from tehgeekmeister/masterVijay Dev2013-01-091-2/+2
|\ \ \ \ | | | | | | | | | | Fix a typo in a test.
| * | | | s/messqage/message/ in message_encryptor_test.rbEzekiel Smithburg2013-01-091-2/+2
| | | | |
* | | | | Merge pull request #8848 from Irio/masterCarlos Antonio da Silva2013-01-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Set default value to ActiveModel::Validator initializer attribute
| * | | | | Set default value to ActiveModel::Validator initializer attributeIrio Irineu Musskopf Junior2013-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Makes it easier to test its objects.
* | | | | | Merge pull request #8849 from mattdbridges/contributing_to_railsCarlos Antonio da Silva2013-01-091-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Adding mention about single-line blocks in Contributing to Rails [ci skip]
| * | | | | | adding small mention one single line blocks in contributing to railsMatt Bridges2013-01-091-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #8839 from mattdbridges/clarify_chdirRafael Mendonça França2013-01-091-5/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Clarify Dir.chdir definition
| * | | | | use multiline do-end blocks and rearrange definition for clarityMatt Bridges2013-01-091-5/+5
| | | | | |
* | | | | | Merge pull request #8842 from nthj/patch-1Rafael Mendonça França2013-01-091-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix typo in deprecation warning
| * | | | | Fix typo in deprecation warningNathaniel Jones2013-01-091-1/+1
|/ / / / /
* | | | | 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
| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 15:59:12 +0000