aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-233-34/+463
|\
| * copy edits in collection proxy docs [ci skip]Vijay Dev2012-05-231-25/+18
| * Revert "Remove blank trailing comments"Vijay Dev2012-05-2318-0/+28
| * add CollectionProxy#length documentationFrancesco Rodriguez2012-05-221-5/+37
| * add CollectionProxy#size documentationFrancesco Rodriguez2012-05-221-2/+25
| * add :call-seq: to +first+ and +last+ CollectionProxy methodsFrancesco Rodriguez2012-05-221-0/+6
| * add CollectionProxy#create! documentationFrancesco Rodriguez2012-05-221-0/+22
| * add CollectionProxy#create documentationFrancesco Rodriguez2012-05-221-0/+33
| * add more examples to CollectionProxy#findFrancesco Rodriguez2012-05-221-0/+9
| * adding :call-seq: to CollectionProxy methodsFrancesco Rodriguez2012-05-221-0/+39
| * add CollectionProxy#build documentationFrancesco Rodriguez2012-05-221-0/+31
| * remove repeated documentation in CollectionProxy#clearFrancesco Rodriguez2012-05-221-24/+2
| * update CollectionProxy#clear documentationFrancesco Rodriguez2012-05-211-3/+2
| * update CollectionProxy#delete_all documentationFrancesco Rodriguez2012-05-211-2/+29
| * add CollectionProxy#delete_all documentationFrancesco Rodriguez2012-05-211-0/+65
| * Fix AR preloader exampleAlexey Vakhov2012-05-221-1/+1
| * fix CollectionProxy documentation markupFrancesco Rodriguez2012-05-211-8/+8
| * add CollectionProxy#reload documentationFrancesco Rodriguez2012-05-211-0/+18
| * improve CollectionProxy#destroy documentationFrancesco Rodriguez2012-05-211-5/+37
| * add CollectionProxy#destroy documentationFrancesco Rodriguez2012-05-211-1/+42
| * update CollectionProxy#destroy_all documentationFrancesco Rodriguez2012-05-201-1/+9
| * Remove blank trailing commentsHenrik Hodne2012-05-2018-28/+0
| * add CollectionProxy#select documentationFrancesco Rodriguez2012-05-191-2/+55
| * add CollectionProxy#find documentationFrancesco Rodriguez2012-05-191-0/+20
| * Revert typoOscar Del Ben2012-05-191-1/+1
| * TypoOscar Del Ben2012-05-191-4/+4
* | ConnectionPool wait_timeout no longer used for different types of timeouts. #...Jonathan Rochkind2012-05-231-7/+16
* | changed xml type datetime to dateTime, fixes #6328Angelo capilleri2012-05-231-2/+2
* | Revert "Merge pull request #6416 from pmahoney/threadsafe-connection-pool"Rafael Mendonça França2012-05-221-86/+34
* | Fix the buildSantiago Pastorino2012-05-221-1/+0
* | require active_support/lazy_load_hooks where is neededSantiago Pastorino2012-05-221-0/+1
* | Merge pull request #6368 from Antiarchitect/store-indifferent-accessJeremy Kemper2012-05-221-10/+27
|\ \
| * | Convert Hash to HashWithIndifferentAccess in ActiveRecord::Store.Andrey Voronkov2012-05-221-10/+27
* | | 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