aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Specified jbuilder versionPavel Pravosud2013-01-111-1/+1
|/ / / / /
* | | | | Merge pull request #8884 from mattdbridges/array-access-doc-fixesGuillermo Iguaran2013-01-101-4/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Updating Array access docs more consistentMatt Bridges2013-01-101-4/+4
|/ / / /
* | | | Merge pull request #8869 from goshakkk/guides-asset-pipeline-tiltGuillermo Iguaran2013-01-101-1/+25
|\ \ \ \
| * | | | add asset pipeline guides section on implementing & registering own enginesGosha Arinich2013-01-101-1/+25
* | | | | Relax bundler dep until 1.3.0 is actually released.Jeremy Kemper2013-01-102-2/+2
* | | | | Include jbuilder by default and rely on its scaffold generator to show json A...David Heinemeier Hansson2013-01-106-99/+14
* | | | | Merge pull request #8878 from senny/add_performance_test_extraction_to_guideGuillermo Iguaran2013-01-101-0/+1
|\ \ \ \ \
| * | | | | mention performance test extraction in 4.0 guideYves Senn2013-01-101-0/+1
|/ / / / /
* | | | | Merge pull request #8876 from senny/extract_performance_testsGuillermo Iguaran2013-01-1033-1640/+20
|\ \ \ \ \
| * | | | | remove the rails guide on performance testingYves Senn2013-01-103-692/+0
| * | | | | remove performance tests from the default stackYves Senn2013-01-1010-47/+5
| * | | | | 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 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 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
|\ \ \ \
| * | | | 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 attributeIrio Irineu Musskopf Junior2013-01-091-1/+1
* | | | | | Merge pull request #8849 from mattdbridges/contributing_to_railsCarlos Antonio da Silva2013-01-091-0/+1
|\ \ \ \ \ \
| * | | | | | adding small mention one single line blocks in contributing to railsMatt Bridges2013-01-091-0/+1
|/ / / / / /
* | | | | | Merge pull request #8839 from mattdbridges/clarify_chdirRafael Mendonça França2013-01-091-5/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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 warningNathaniel Jones2013-01-091-1/+1
|/ / / / /
* | | | | Merge pull request #8824 from mjtko/fix/cookie-store-inheritanceSantiago Pastorino2013-01-082-5/+26
|\ \ \ \ \
| * | | | | Revert cb3181e - no longer required.Mark J. Titorenko2013-01-081-2/+0
| * | | | | Fix CookieStore middleware inheritance hierarchy s.t. it inherits from Rack::...Mark J. Titorenko2013-01-081-3/+26
* | | | | | 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]Diogo Mafra2013-01-081-1/+1
|/ / / / / /
* | | | | | Merge pull request #8823 from acapilleri/target_reflection_has_associated_recordCarlos Antonio da Silva2013-01-081-5/+1
|\ \ \ \ \ \
| * | | | | | 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 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
* | | | | | | 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 removalPrem Sichanugrist2013-01-081-1/+5
|/ / / / / / /
* | | | | | | remove yaml as a param parser :burn:Aaron Patterson2013-01-081-2/+0
* | | | | | | 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] * dealin...Aaron Patterson2013-01-085-5/+44
* | | | | | | Revert "Merge branch 'master-sec'"Jeremy Kemper2013-01-089-109/+15