| Commit message (Expand) | Author | Age | Files | Lines |
* | Fix merge error when Equality LHS is non-attribute. | 90yukke | 2013-07-23 | 1 | -0/+15 |
* | Use Ruby 1.8 syntax | Rafael Mendonça França | 2013-07-15 | 1 | -1/+1 |
* | Merge pull request #11451 from jetthoughts/11450_do_not_resave_destroyed_asso... | Yves Senn | 2013-07-15 | 1 | -0/+7 |
* | Skip connection url test when the machine is using socket configuration. | Rafael Mendonça França | 2013-07-06 | 1 | -0/+3 |
* | Merge pull request #11019 from tkhr/test_case_for_issue_10393 | Yves Senn | 2013-06-25 | 1 | -0/+23 |
|\ |
|
| * | Allow global override of default STI inheritance column | chapmajs | 2013-06-26 | 1 | -0/+23 |
* | | build fix, fall back to old hash syntax | Yves Senn | 2013-06-26 | 1 | -3/+3 |
|/ |
|
* | Merge pull request #9893 from JonRowe/add_test_to_assert_association_doesnt_o... | Yves Senn | 2013-06-25 | 1 | -0/+13 |
|\ |
|
| * | test case to assert that associations do not overwrite after create, fixes #9310 | Jon Rowe | 2013-03-24 | 1 | -0/+13 |
* | | Merge pull request #10373 from janko-m/fix-store-accessor | Carlos Antonio da Silva | 2013-06-25 | 1 | -0/+7 |
|\ \ |
|
| * | | Fix ActiveRecord::Store not tracking changes | Janko Marohnić | 2013-04-29 | 1 | -0/+7 |
* | | | Revert "Revert "Merge pull request #10901 from armstrjare/fix_query_null_fore... | Yves Senn | 2013-06-25 | 1 | -0/+27 |
* | | | Revert "Merge pull request #10901 from armstrjare/fix_query_null_foreign_key_... | Yves Senn | 2013-06-22 | 1 | -27/+0 |
* | | | Merge pull request #10901 from armstrjare/fix_query_null_foreign_key_on_new_r... | Yves Senn | 2013-06-22 | 1 | -0/+27 |
|\ \ \ |
|
| * | | | Fixes CollectionAssociation#ids_reader returning incorrect ids for new records | Jared Armstrong | 2013-06-21 | 1 | -0/+27 |
* | | | | Merge pull request #10925 from senny/10917_test_to_prevent_regression | Yves Senn | 2013-06-15 | 1 | -0/+26 |
|/ / / |
|
* | | | adding a test for #10830 | Aaron Patterson | 2013-06-05 | 1 | -0/+46 |
* | | | Using 1.8.7 syntax for 3-2-stable | Arun Agrawal | 2013-05-24 | 3 | -6/+6 |
* | | | Merge pull request #10713 from senny/10693_fix_primary_key_option_on_has_many | Rafael Mendonça França | 2013-05-23 | 2 | -0/+9 |
* | | | destroys association records before saving/inserting new association records | Johnny Holton | 2013-05-18 | 1 | -3/+19 |
* | | | Backport a super-simplified version of #6792, fixing | Ben Woosley | 2013-05-14 | 1 | -0/+12 |
* | | | Preserve context for joins while merging relations | Andrew Horner | 2013-05-11 | 1 | -1/+8 |
* | | | Don't try to EXPLAIN select_db calls | Daniel Schierbeck | 2013-05-12 | 1 | -0/+7 |
* | | | Revert "Don't try to EXPLAIN select_db calls" | Xavier Noria | 2013-05-11 | 1 | -7/+0 |
* | | | Merge pull request #10555 from dasch/dasch/3-2-stable | Xavier Noria | 2013-05-10 | 1 | -0/+7 |
|\ \ \ |
|
| * | | | Don't try to EXPLAIN select_db calls | Daniel Schierbeck | 2013-05-10 | 1 | -0/+7 |
| |/ / |
|
* | | | Fixed pluck to be working with selects. | Arun Agrawal | 2013-05-10 | 1 | -2/+3 |
* | | | Revert "Merge pull request #8209 from senny/backport_8176" | Rafael Mendonça França | 2013-05-08 | 1 | -3/+2 |
* | | | Merge pull request #10489 from greenriver/ar_counter_cache_multiple_destroy | Rafael Mendonça França | 2013-05-06 | 1 | -0/+20 |
|/ / |
|
* | | adding test for the symbol refs | Aaron Patterson | 2013-04-26 | 1 | -0/+7 |
* | | Correctly parse bigint defaults in PostgreSQL, Backpost #10098. | Erik Peterson | 2013-04-11 | 2 | -0/+6 |
* | | Merge branch '3-2-later' into 3-2-stable | Aaron Patterson | 2013-04-09 | 1 | -0/+10 |
|\ \ |
|
| * | | adding test for CVE | Aaron Patterson | 2013-02-09 | 1 | -0/+10 |
| * | | Merge pull request #9224 from dylanahsmith/bigdecimal-takes-string | Guillermo Iguaran | 2013-02-09 | 1 | -1/+1 |
| * | | Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric | Guillermo Iguaran | 2013-02-09 | 4 | -10/+37 |
* | | | Merge pull request #7792 from seejee/chained_scopes_preload_properly | Carlos Antonio da Silva | 2013-04-03 | 2 | -0/+10 |
|\ \ \ |
|
| * | | | Chained scopes will be preloaded properly. Fixes #7490 | Chris Geihsler | 2013-04-03 | 2 | -0/+10 |
* | | | | Don't reset inheritance_column when setting explicitly. | Fred Wu | 2013-03-27 | 1 | -0/+10 |
* | | | | use ruby 1.8 Hash syntax [ci skip] | Yves Senn | 2013-03-22 | 1 | -1/+1 |
* | | | | do not reset associations when preloading twice. | Yves Senn | 2013-03-22 | 1 | -0/+7 |
| |_|/
|/| | |
|
* | | | Wrong exception is occured when raising no translatable exception | kennyj | 2013-03-20 | 1 | -0/+6 |
* | | | Bring back test and changelog entry from #pluck method and select clause | Carlos Antonio da Silva | 2013-03-18 | 1 | -0/+6 |
* | | | Merge branch '3-2-13' into 3-2-stable | Aaron Patterson | 2013-03-18 | 3 | -14/+8 |
|\ \ \ |
|
| * | | | stop calling to_sym when building arel nodes [CVE-2013-1854] | Aaron Patterson | 2013-03-15 | 2 | -8/+8 |
| |/ / |
|
| * | | Revert "Merge pull request #8209 from senny/backport_8176" | Aaron Patterson | 2013-03-05 | 1 | -6/+0 |
* | | | Fix ar:mysql2 build on Ruby 1.8.7 | Andrew White | 2013-03-13 | 1 | -4/+12 |
* | | | Merge pull request #9613 from arunagw/remove_fixme | Carlos Antonio da Silva | 2013-03-08 | 1 | -9/+8 |
|\ \ \ |
|
| * | | | Removing FIXME | Arun Agrawal | 2013-03-08 | 1 | -9/+8 |
* | | | | Merge pull request #9549 from larrylv/reload-stable-target-before-saving | Rafael Mendonça França | 2013-03-07 | 1 | -0/+14 |
|\ \ \ \ |
|
| * | | | | Fix issue #7526. Reload the target if it's stale. | larrylv | 2013-03-05 | 1 | -0/+14 |