| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | | Fix the CHANGELOG entry order [ci skip] | Rafael Mendonça França | 2013-01-25 | 1 | -3/+5 |
* | | | | Merge pull request #9074 from gaynetdinov/replace_undefined_abcs_to_config_va... | Carlos Antonio da Silva | 2013-01-25 | 1 | -3/+3 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Replaced abcs to config. | Damir Gaynetdinov | 2013-01-25 | 1 | -3/+3 |
|/ / / |
|
* | | | Add changelog entry for skipping explain from dbs that don't support it | Carlos Antonio da Silva | 2013-01-22 | 1 | -0/+5 |
* | | | Merge pull request #6197 from blakesmith/connection_adapters_without_explain_... | Xavier Noria | 2013-01-22 | 3 | -6/+24 |
* | | | Revert "Merge pull request #6986 from kennyj/fix_6975" | Andrew White | 2013-01-22 | 3 | -29/+10 |
* | | | Add failing test case for #8460 | Andrew White | 2013-01-22 | 1 | -0/+14 |
* | | | Duplicate possible frozen string from route | Andrew White | 2013-01-21 | 2 | -2/+10 |
* | | | Remove warning of not used variable | Carlos Antonio da Silva | 2013-01-17 | 1 | -1/+1 |
* | | | Do not run this streaming test in Ruby 1.8, fix syntax error | Carlos Antonio da Silva | 2013-01-17 | 1 | -5/+8 |
| |/
|/| |
|
* | | Merge pull request #5288 from lest/patch-2 | José Valim | 2013-01-17 | 3 | -0/+21 |
* | | Merge pull request #8632 from asanghi/3-2-stable | Andrew White | 2013-01-16 | 3 | -1/+32 |
|\ \ |
|
| * | | fixes #8631 local inflections from interfereing with HTTP_METHOD_LOOKUP dispa... | Aditya Sanghi | 2013-01-16 | 3 | -1/+32 |
|/ / |
|
* | | Merge pull request #8933 from freerange/3-2-stable-with-minitest-fix | Rafael Mendonça França | 2013-01-15 | 1 | -1/+1 |
|\ \ |
|
| * | | Make tests for the presence of MiniTest consistent. | James Mead | 2013-01-14 | 1 | -1/+1 |
* | | | Merge pull request #8914 from nilbus/fix-header-bloat | Rafael Mendonça França | 2013-01-15 | 3 | -2/+10 |
* | | | Merge branch 'revert-binds-3-2' into 3-2-stable | Carlos Antonio da Silva | 2013-01-15 | 8 | -49/+12 |
|\ \ \ |
|
| * | | | Revert "Work around undiagnosed bug that's draining a relation's bind_values" | Carlos Antonio da Silva | 2013-01-15 | 1 | -1/+0 |
| * | | | Revert "Merge pull request #7983 from georgebrock/bug7950-squashed" | Carlos Antonio da Silva | 2013-01-15 | 8 | -48/+12 |
|/ / / |
|
* | | | Fix the TestCase class and make tests pass on ruby 2.0 | Rafael Mendonça França | 2013-01-14 | 1 | -2/+2 |
* | | | Add regression test to #8907 | Rafael Mendonça França | 2013-01-14 | 1 | -0/+31 |
|/ / |
|
* | | Merge pull request #8927 from dkubb/issue-8178 | Rafael Mendonça França | 2013-01-14 | 3 | -1/+10 |
|\ \ |
|
| * | | Test to allow Range including DateTime and DateTime::Infinity | gsphanikumar | 2013-01-13 | 1 | -0/+6 |
| * | | Fix DateTime comparison with DateTime::Infinity object | Dan Kubb | 2013-01-13 | 2 | -1/+4 |
|/ / |
|
* | | Merge pull request #8907 from rubys/master | Rafael Mendonça França | 2013-01-12 | 1 | -1/+2 |
* | | Remove unnecessary caching of ParameterFilter | Andrew White | 2013-01-12 | 1 | -3/+1 |
* | | Merge pull request #8895 from ernie/revert-hmt-on-unsaved-in-3-2 | Rafael Mendonça França | 2013-01-11 | 3 | -19/+6 |
|\ \ |
|
| * | | Revert "Merge pull request #7661 from ernie/build-join-records-on-unsaved-hmt" | Ernie Miller | 2013-01-11 | 3 | -19/+6 |
|/ / |
|
* | | Merge pull request #8888 from dylanahsmith/3-2-parse-non-object-json-params | Jeremy Kemper | 2013-01-10 | 3 | -2/+13 |
|\ \ |
|
| * | | Fix JSON params parsing regression for non-object JSON content. | Dylan Smith | 2013-01-11 | 3 | -2/+13 |
|/ / |
|
* | | Reorder AP changelog and remove duplicated entry [ci skip] | Carlos Antonio da Silva | 2013-01-10 | 1 | -11/+9 |
* | | Merge pull request #8756 from causes/js_include_tag_fix | Guillermo Iguaran | 2013-01-10 | 3 | -9/+28 |
|\ \ |
|
| * | | Fix javascript_include_tag when no js runtime is available | Noah Silas | 2013-01-07 | 3 | -9/+28 |
* | | | Merge pull request #8735 from jejacks0n/duplicate_asset_fix | Guillermo Iguaran | 2013-01-10 | 5 | -2/+16 |
|\ \ \ |
|
| * | | | Fixes issue where duplicate assets can be required with sprockets. | jejacks0n | 2013-01-10 | 5 | -2/+16 |
|/ / / |
|
* | | | Update changelogs with release date [ci skip] | Carlos Antonio da Silva | 2013-01-09 | 7 | -9/+35 |
* | | | Merge pull request #8838 from yahonda/8806_3-2-stable | Rafael Mendonça França | 2013-01-09 | 2 | -13/+27 |
|\ \ \ |
|
| * | | | Ignore binds payload with nil column in AR log subscriber | Yasuo Honda | 2013-01-09 | 2 | -13/+27 |
* | | | | Merge pull request #8834 from sikachu/3-2-stable-fix-ars | Carlos Antonio da Silva | 2013-01-08 | 2 | -27/+0 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Remove test for XML YAML parsing | Prem Sichanugrist | 2013-01-08 | 2 | -27/+0 |
|/ / / |
|
* | | | Merge branch '3-2-sec' into 3-2-secmerge | Aaron Patterson | 2013-01-08 | 21 | -37/+147 |
|\ \ \
| | |/
| |/| |
|
| * | | bumping version | Aaron Patterson | 2013-01-08 | 9 | -9/+9 |
| * | | CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. | Jeremy Kemper | 2013-01-08 | 4 | -13/+69 |
| * | | * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealin... | Aaron Patterson | 2013-01-08 | 8 | -10/+67 |
| * | | Avoid Rack security warning no secret provided | Santiago Pastorino | 2013-01-08 | 1 | -0/+2 |
* | | | Changelog improvements [ci skip] | Carlos Antonio da Silva | 2013-01-08 | 1 | -6/+5 |
* | | | Bump rack dependency to 1.4.3 | Carlos Antonio da Silva | 2013-01-08 | 2 | -1/+5 |
* | | | Merge pull request #8812 from rubys/master | Carlos Antonio da Silva | 2013-01-08 | 1 | -1/+1 |
* | | | Wrap time ranges with timezones, closes #8807 | Vasiliy Ermolovich | 2013-01-08 | 5 | -43/+67 |
* | | | Avoid Rack security warning no secret provided | Santiago Pastorino | 2013-01-08 | 1 | -0/+2 |