aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #9074 from gaynetdinov/replace_undefined_abcs_to_config_va...Carlos Antonio da Silva2013-01-251-3/+3
|\ \ \ | |/ / |/| |
| * | Replaced abcs to config.Damir Gaynetdinov2013-01-251-3/+3
|/ /
* | Add changelog entry for skipping explain from dbs that don't support itCarlos Antonio da Silva2013-01-221-0/+5
* | Merge pull request #6197 from blakesmith/connection_adapters_without_explain_...Xavier Noria2013-01-223-6/+24
* | Revert "Merge pull request #6986 from kennyj/fix_6975"Andrew White2013-01-223-29/+10
* | Add failing test case for #8460Andrew White2013-01-221-0/+14
* | Duplicate possible frozen string from routeAndrew White2013-01-212-2/+10
* | Remove warning of not used variableCarlos Antonio da Silva2013-01-171-1/+1
* | Do not run this streaming test in Ruby 1.8, fix syntax errorCarlos Antonio da Silva2013-01-171-5/+8
* | Merge pull request #5288 from lest/patch-2José Valim2013-01-173-0/+21
* | Merge pull request #8632 from asanghi/3-2-stableAndrew White2013-01-163-1/+32
|\ \
| * | fixes #8631 local inflections from interfereing with HTTP_METHOD_LOOKUP dispa...Aditya Sanghi2013-01-163-1/+32
|/ /
* | Merge pull request #8933 from freerange/3-2-stable-with-minitest-fixRafael Mendonça França2013-01-151-1/+1
|\ \
| * | Make tests for the presence of MiniTest consistent.James Mead2013-01-141-1/+1
* | | Merge pull request #8914 from nilbus/fix-header-bloatRafael Mendonça França2013-01-153-2/+10
* | | Merge branch 'revert-binds-3-2' into 3-2-stableCarlos Antonio da Silva2013-01-158-49/+12
|\ \ \
| * | | Revert "Work around undiagnosed bug that's draining a relation's bind_values"Carlos Antonio da Silva2013-01-151-1/+0
| * | | Revert "Merge pull request #7983 from georgebrock/bug7950-squashed"Carlos Antonio da Silva2013-01-158-48/+12
|/ / /
* | | Fix the TestCase class and make tests pass on ruby 2.0Rafael Mendonça França2013-01-141-2/+2
* | | Add regression test to #8907Rafael Mendonça França2013-01-141-0/+31
|/ /
* | Merge pull request #8927 from dkubb/issue-8178Rafael Mendonça França2013-01-143-1/+10
|\ \
| * | Test to allow Range including DateTime and DateTime::Infinitygsphanikumar2013-01-131-0/+6
| * | Fix DateTime comparison with DateTime::Infinity objectDan Kubb2013-01-132-1/+4
|/ /
* | Merge pull request #8907 from rubys/masterRafael Mendonça França2013-01-121-1/+2
* | Remove unnecessary caching of ParameterFilterAndrew White2013-01-121-3/+1
* | Merge pull request #8895 from ernie/revert-hmt-on-unsaved-in-3-2Rafael Mendonça França2013-01-113-19/+6
|\ \
| * | Revert "Merge pull request #7661 from ernie/build-join-records-on-unsaved-hmt"Ernie Miller2013-01-113-19/+6
|/ /
* | Merge pull request #8888 from dylanahsmith/3-2-parse-non-object-json-paramsJeremy Kemper2013-01-103-2/+13
|\ \
| * | Fix JSON params parsing regression for non-object JSON content.Dylan Smith2013-01-113-2/+13
|/ /
* | Reorder AP changelog and remove duplicated entry [ci skip]Carlos Antonio da Silva2013-01-101-11/+9
* | Merge pull request #8756 from causes/js_include_tag_fixGuillermo Iguaran2013-01-103-9/+28
|\ \
| * | Fix javascript_include_tag when no js runtime is availableNoah Silas2013-01-073-9/+28
* | | Merge pull request #8735 from jejacks0n/duplicate_asset_fixGuillermo Iguaran2013-01-105-2/+16
|\ \ \
| * | | Fixes issue where duplicate assets can be required with sprockets.jejacks0n2013-01-105-2/+16
|/ / /
* | | Update changelogs with release date [ci skip]Carlos Antonio da Silva2013-01-097-9/+35
* | | Merge pull request #8838 from yahonda/8806_3-2-stableRafael Mendonça França2013-01-092-13/+27
|\ \ \
| * | | Ignore binds payload with nil column in AR log subscriberYasuo Honda2013-01-092-13/+27
* | | | Merge pull request #8834 from sikachu/3-2-stable-fix-arsCarlos Antonio da Silva2013-01-082-27/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove test for XML YAML parsingPrem Sichanugrist2013-01-082-27/+0
|/ / /
* | | Merge branch '3-2-sec' into 3-2-secmergeAaron Patterson2013-01-0821-37/+147
|\ \ \ | | |/ | |/|
| * | bumping versionAaron Patterson2013-01-089-9/+9
| * | CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml.Jeremy Kemper2013-01-084-13/+69
| * | * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealin...Aaron Patterson2013-01-088-10/+67
| * | Avoid Rack security warning no secret providedSantiago Pastorino2013-01-081-0/+2
* | | Changelog improvements [ci skip]Carlos Antonio da Silva2013-01-081-6/+5
* | | Bump rack dependency to 1.4.3Carlos Antonio da Silva2013-01-082-1/+5
* | | Merge pull request #8812 from rubys/masterCarlos Antonio da Silva2013-01-081-1/+1
* | | Wrap time ranges with timezones, closes #8807Vasiliy Ermolovich2013-01-085-43/+67
* | | Avoid Rack security warning no secret providedSantiago Pastorino2013-01-081-0/+2
* | | Refactor write attribute logic to convert number column valueCarlos Antonio da Silva2013-01-071-4/+5