aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fixing call to columns hash. run the damn tests when you backport!Aaron Patterson2013-02-091-1/+1
* Bump rack dependency to 1.4.5Santiago Pastorino2013-02-081-1/+1
* Merge pull request #9224 from dylanahsmith/bigdecimal-takes-stringGuillermo Iguaran2013-02-081-1/+1
|\
| * Fix test failure for ruby 1.8.Dylan Smith2013-02-081-1/+1
|/
* Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numericGuillermo Iguaran2013-02-078-14/+59
|\
| * active_record: Quote numeric values compared to string columns.Dylan Smith2013-02-078-14/+59
|/
* Merge pull request #9159 from lexmag/col_defaults-dup-fixCarlos Antonio da Silva2013-02-034-2/+16
|\
| * This pull requests addresses ORA-01400 errors and also supports #6115 issue t...Yasuo Honda2013-02-031-1/+1
| * Duplicate column_defaults properlyPiotr Sarnacki2013-02-034-2/+16
|/
* Merge pull request #9078 from senny/6865_ar_count_with_uniqRafael Mendonça França2013-02-023-1/+15
* Fix markdown syntax in actionpack CHANGELOG.Steve Klabnik2013-02-011-1/+2
* Merge pull request #9043 from senny/backport_7536Carlos Antonio da Silva2013-01-295-3/+23
|\
| * Fix pluck when columns/tables are reserved words.Ian Lesperance2013-01-235-3/+23
* | Merge pull request #9114 from rosenfeld/patch-2Rafael Mendonça França2013-01-291-0/+1
|\ \
| * | Add another NumberHelper missing dependencyRodrigo Rosenfeld Rosas2013-01-291-0/+1
|/ /
* | Merge pull request #9113 from rosenfeld/patch-1Rafael Mendonça França2013-01-291-0/+1
|\ \
| * | Add NumberHelper missing dependencyRodrigo Rosenfeld Rosas2013-01-291-0/+1
|/ /
* | Install latest bundler on Travis.José Valim2013-01-261-0/+2
* | Fix the CHANGELOG entry order [ci skip]Rafael Mendonça França2013-01-251-3/+5
* | 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
|\