aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* 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
| * guarantee a list in the alias tracker so we can remove a conditionalAaron Patterson2014-02-143-6/+12
| * stop exposing table_joinsAaron Patterson2014-02-141-4/+3
| * make most parameters to the AliasTracker requiredAaron Patterson2014-02-142-6/+4
| * make a singleton for AssociationScopeAaron Patterson2014-02-143-3/+8
| * pass the association and connection to the scope methodAaron Patterson2014-02-143-11/+7
| * pass the tracker down the stack and construct it in the scope methodAaron Patterson2014-02-141-18/+18
| * clean up add_constraints signatureAaron Patterson2014-02-141-8/+9
| * remove the reflection delegateAaron Patterson2014-02-141-15/+14
| * remove klass delegatorAaron Patterson2014-02-141-10/+11
| * remove chain delegateAaron Patterson2014-02-141-5/+6
| * remove scope_chain delegateAaron Patterson2014-02-141-3/+3
| * Merge pull request #14048 from pcreux/better-error-message-db-migrate-downCarlos Antonio da Silva2014-02-141-1/+1
| |\
| | * Add hint to error message of task db:migrate:downPhilippe Creux2014-02-131-1/+1
| * | remove unused fixtures from sqlite3 test casesRajarshi Das2014-02-141-1/+1
| * | remove more delegate methodsAaron Patterson2014-02-131-7/+9
| * | :scissors: whitespaceAaron Patterson2014-02-131-1/+0
| * | rm delegate methods that are not actually usedAaron Patterson2014-02-131-2/+2
| * | JoinHelper is never reused, so there is no need to separateAaron Patterson2014-02-133-42/+25
| * | speed up the collection proxy reader method, but slow down the constructorAaron Patterson2014-02-131-1/+5
| * | Merge pull request #14034 from hdabrows/drop-correct-index-when-reverting-mig...Yves Senn2014-02-134-4/+49
| |\ \
| | * | Drop the correct index after reverting a migrationHubert Dąbrowski2014-02-134-4/+49
| * | | Merge pull request #14045 from arthurnn/kill_fibersGuillermo Iguaran2014-02-131-2/+4
| |\ \ \
| | * | | Dont use Enumarator on join_associationArthur Neves2014-02-131-2/+4
| * | | | tests are responsible to clean up afterwards.Yves Senn2014-02-131-82/+114
| |/ / /
| * | | Terminate the backend ourselves on PG 9.2+Matthew Draper2014-02-121-19/+29
| * | | `execute` is a hotspot, so let's reduce branchesAaron Patterson2014-02-121-6/+2
| |/ /
| * | adding missed changekayvan2014-02-111-1/+1
| * | adding connection parameter to check_pending for migrationskayvan2014-02-111-5/+5
| * | test case to illustrate current PostgreSQL composite behavior.Yves Senn2014-02-111-0/+42
| * | Avoid using deprecated arel constantsRafael Mendonça França2014-02-102-3/+3
| * | add activerecord test coverage for `sanitize_sql_array`Dmitry Polushkin2014-02-091-0/+5
| * | move alias method `sanitize_conditions` to a correct placeDmitry Polushkin2014-02-091-2/+1
| * | Merge pull request #13981 from Fortisque/kevin/postgresql_reaper_threadsafeAaron Patterson2014-02-085-4/+15
| |\ \
| | * | Reaper has access to threadsafe active? callKevin Casey2014-02-085-4/+15
| * | | Merge pull request #13978 from Fortisque/kevin/validation_context_for_childrenAaron Patterson2014-02-084-1/+27
| |\ \ \
| | * | | context in validation goes through has many relationshipKevin Casey2014-02-084-1/+27
| * | | | Skips linked folder tests if symlink is invalidMikko Johansson2014-02-091-2/+6
| | |/ / | |/| |
| * | | Add test case for autosave HasMany with accepts_nested_attributes.Lauro Caetano2014-02-083-0/+33
| * | | Adjust test value so that timezone has no effectAndrew White2014-02-071-1/+1
| |/ /
| * | Merge branch 'dump-schema-after-migration-flag' of git://github.com/emilsoman...Xavier Noria2014-02-063-1/+18
| |\ \
| | * | Add config to disable schema dump after migrationEmil Soman2014-02-063-1/+18