aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Restore the frozen state on rollback. Fixes #6417.Godfrey Chan2012-05-211-1/+3
* | | | | | Refactor aggregation writer methodCarlos Antonio da Silva2012-05-211-4/+3
* | | | | | Merge pull request #6416 from pmahoney/threadsafe-connection-poolAaron Patterson2012-05-211-34/+86
|\ \ \ \ \ \
| * | | | | | Make connection pool fair with respect to waiting threads.Patrick Mahoney2012-05-201-34/+86
* | | | | | | Merge pull request #6143 from senny/composed_of_converter_returns_nilAaron Patterson2012-05-211-7/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | allow the :converter Proc form composed_of to return nilYves Senn2012-05-031-7/+8
* | | | | | | Merge pull request #6397 from kennyj/fix_translate_exceptionAaron Patterson2012-05-191-3/+7
|\ \ \ \ \ \ \
| * | | | | | | Fix a problem of translate_exception method in Japanese.kennyj2012-05-201-3/+7
| | |_|/ / / / | |/| | | | |
* / | | | | | Synchronize read and modification of @reserved_connections hash to avoid conc...Patrick Mahoney2012-05-191-4/+8
|/ / / / / /
* | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-194-23/+305
|\ \ \ \ \ \
| * | | | | | copy edits [ci skip]Vijay Dev2012-05-191-17/+20
| * | | | | | add CollectionProxy#last documentationFrancesco Rodriguez2012-05-191-0/+27
| * | | | | | add CollectionProxy#first documentationFrancesco Rodriguez2012-05-191-0/+27
| * | | | | | Revert "You can add a custom primary key to a table"Vijay Dev2012-05-191-5/+0
| * | | | | | improve CollectionProxy#concat documentationFrancesco Rodriguez2012-05-191-7/+18
| * | | | | | fix CollectionProxy#<< documentationFrancesco Rodriguez2012-05-191-1/+1
| * | | | | | add CollectionProxy#<< documentationFrancesco Rodriguez2012-05-191-0/+20
| * | | | | | add CollectionProxy#clear documentationFrancesco Rodriguez2012-05-191-0/+26
| * | | | | | add CollectionProxy#include? documentationFrancesco Rodriguez2012-05-181-0/+13
| * | | | | | You can add a custom primary key to a tableAvi Tzurel2012-05-191-0/+5
| * | | | | | move docs from CollectionAssociation to CollectionProxyFrancesco Rodriguez2012-05-182-114/+143
| * | | | | | add explanation of raising errors when a limit scope is supplied in Relation#...Francesco Rodriguez2012-05-181-11/+11
| * | | | | | Fix typo.Peter Suschlik2012-05-181-1/+1
| * | | | | | remove incorrect example of CollectionAssociation#empty?Francesco Rodriguez2012-05-181-17/+0
| * | | | | | add docs to CollectionAssociation#empty?Francesco Rodriguez2012-05-181-3/+32
| * | | | | | add docs to CollectionAssociation#any?Francesco Rodriguez2012-05-181-0/+30
| * | | | | | add examples to CollectionAssociation#concatFrancesco Rodriguez2012-05-181-3/+14
| * | | | | | fix CollectionAssociation docsFrancesco Rodriguez2012-05-171-1/+1
| * | | | | | add example to CollectionAssociation#destroy_allFrancesco Rodriguez2012-05-171-3/+14
| * | | | | | add more explanation to CollectionAssociation docsFrancesco Rodriguez2012-05-171-0/+4
| * | | | | | add CollectionAssociation hierarchyFrancesco Rodriguez2012-05-171-2/+7
| * | | | | | add docs to CollectionAssociation#many?Francesco Rodriguez2012-05-171-1/+34
| * | | | | | fix CollectionAssociation#replace docsFrancesco Rodriguez2012-05-171-3/+3
| * | | | | | Add docs to CollectionAssociation#replaceFrancesco Rodriguez2012-05-171-3/+23
* | | | | | | Merge pull request #4835 from pacoguzman/refactor_define_restrict_dependency_...Carlos Antonio da Silva2012-05-191-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Refactor define_restrict_dependency_method using reflectionPaco Guzman2012-02-011-3/+3
* | | | | | | | Ensure that CollectionAssociation#replace returns proper targetPiotr Sarnacki2012-05-191-1/+1
* | | | | | | | Merge pull request #6376 from jgaskins/timestamp-microsecondsJeremy Kemper2012-05-181-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Increase `AR#cache_key` precision to nanosecondsJamie Gaskins2012-05-191-1/+1
* | | | | | | | | fix #delete_all with habtm with :delete_sqlJon Leighton2012-05-181-0/+1
* | | | | | | | | no longer need #delete_all_on_destroyJon Leighton2012-05-185-17/+2
* | | | | | | | | Perf: Don't load the association for #delete_all.Jon Leighton2012-05-184-10/+35
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge pull request #6382 from oscardelben/refactor_migration_generatorJosé Valim2012-05-181-6/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Refactor migration generatorOscar Del Ben2012-05-181-6/+3
* | | | | | | | Merge pull request #6238 from pwnall/pgsql_bytea_limitAaron Patterson2012-05-171-8/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Postgresql doesn't accept limits on binary (bytea) columns.Victor Costan2012-05-091-8/+19
* | | | | | | | | Don't destroy readonly modelsJohannes Barre2012-05-171-0/+1
* | | | | | | | | Merge pull request #6058 from RStankov/relation-from-to-accept-other-relation...Jon Leighton2012-05-172-6/+31
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Relation#from to accept other Relation objectsRadoslav Stankov2012-05-172-6/+31
* | | | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-173-3/+3
|\ \ \ \ \ \ \ \ \