aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into adequaterecordAaron Patterson2014-02-271-1/+1
|\
| * Replace "data store" with database [ci skip]Robin Dupret2014-02-271-1/+1
* | Merge branch 'master' into adequaterecordAaron Patterson2014-02-2632-2076/+464
|\|
| * Merge pull request #14211 from loganhasson/masterXavier Noria2014-02-261-12/+12
| |\
| | * [ci skip] Move association class method notesLogan Hasson2014-02-261-12/+12
| * | extract common code in `uuid_test.rb`.Yves Senn2014-02-261-60/+57
| * | move PostgreSQL UUID tests from `datatype_test.rb` to `uuid_test.rb`.Yves Senn2014-02-262-16/+36
| * | test case for custom PostgreSQL enum type.Yves Senn2014-02-261-0/+38
| * | let `insert_record` actuall save the object.Aaron Patterson2014-02-254-4/+32
| * | Merge remote-tracking branch 'chancancode/fix_instance_method_already_impleme...Jon Leighton2014-02-255-13/+31
| |\ \
| | * | Fixed STI classes not defining an attribute method if there is aGodfrey Chan2014-02-235-13/+31
| * | | Merge pull request #14152 from schneems/schneems/fix-ar-wtf-why-is-there-no-e...Aaron Patterson2014-02-252-24/+13
| |\ \ \
| | * | | Handle missing environment from non empty configschneems2014-02-212-24/+13
| * | | | Skip test_migrate_revert_add_index_with_name if databasesYasuo Honda2014-02-251-10/+13
| * | | | Merge pull request #14193 from ys/patch-1Vijay Dev2014-02-251-1/+1
| |\ \ \ \
| | * | | | Add missing parantheses in index_exists?Yannick Schutz2014-02-251-1/+1
| * | | | | Point master changelogs to 4-1-stable branchCarlos Antonio da Silva2014-02-251-1858/+1
| |/ / / /
| * | / / Coerce strings when reading attributes.Yves Senn2014-02-234-7/+50
| | |/ / | |/| |
| * | | Merge pull request #13793 from senny/postgres/dynamic_range_oidYves Senn2014-02-234-63/+147
| |\ \ \
| | * | | deprecate support for pg ranges with excluding beginnings.Yves Senn2014-02-233-23/+78
| | * | | dynamically define PostgreSQL OID range types.Yves Senn2014-02-234-52/+81
| * | | | update version to 4.2.0.alphaYves Senn2014-02-231-1/+1
| |/ / /
| * | | Add tests for default scope behaviour changeJon Leighton2014-02-232-0/+20
| * | | Merge pull request #14164 from vajrasky/fix_typo_max_idGuillermo Iguaran2014-02-221-1/+1
| |\ \ \
| | * | | Fixed typo in comment about MAX_ID.Vajrasky Kok2014-02-231-1/+1
| * | | | Distinguish ConnectionNotEstablished messages: no conn pool for the class, or...Jeremy Kemper2014-02-221-1/+4
| | |/ / | |/| |
| * | | Prevent foreign_key_for? from type casting all attributesWojtek Kruszewski2014-02-211-1/+1
| * | | adding a test for #14106Aaron Patterson2014-02-201-0/+25
| * | | Revert "context in validation goes through has many relationship"Aaron Patterson2014-02-204-27/+1
| * | | Add regression test for collection proxy readerArthur Neves2014-02-201-0/+7
| * | | Revert "speed up the collection proxy reader method, but slow down the constr...Arthur Neves2014-02-201-5/+1
* | | | Merge branch 'master' into adequaterecordAaron Patterson2014-02-184-2/+79
|\| | |
| * | | Typo fix for unscopeAmit Thawait2014-02-181-1/+1
| * | | Merge branch '4-1-0-beta2'Rafael Mendonça França2014-02-184-2/+18
| |\ \ \
| | * | | Preparing for 4.1.0.beta2 releaseRafael Mendonça França2014-02-182-1/+5
| | * | | Correctly escape PostgreSQL arrays.Aaron Patterson2014-02-182-1/+13
| * | | | Don't use `# =>` when it is not the expression valuesRafael Mendonça França2014-02-181-9/+9
| * | | | Fix the column name [ci skip]Rafael Mendonça França2014-02-181-6/+6
| * | | | Document the default scopes change on the release notes, CHANGELOGRafael Mendonça França2014-02-181-0/+61
* | | | | cache queries in the Model.find(id) pathAaron Patterson2014-02-182-0/+28
* | | | | add AST cache to the find_by methodAaron Patterson2014-02-171-0/+35
* | | | | Merge branch 'master' into adequaterecordAaron Patterson2014-02-178-41/+67
|\| | | |
| * | | | Revert "Merge pull request #13344 from ccutrer/fix-from-default-select"Rafael Mendonça França2014-02-173-21/+6
| * | | | No need to use symbolsRafael Mendonça França2014-02-161-3/+3
| * | | | Don't skip tests if they are not broken. Just don't define theyRafael Mendonça França2014-02-162-9/+5
| * | | | Fix typo [ci skip]Rafael Mendonça França2014-02-161-1/+1
| * | | | Resolve encoding issues with arrays of hstore (bug 11135).Josh Goodall2014-02-174-7/+52
* | | | | Merge branch 'master' into adequaterecordAaron Patterson2014-02-17102-487/+1952
|\| | | |
| * | | | Add a missing changelog entry for #13981 and #14035Robin Dupret2014-02-151-0/+7
| * | | | add factory methods for empty alias trackersAaron Patterson2014-02-143-23/+38