Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:lifo/docrails | Alvaro Pereyra | 2012-05-28 | 40 | -99/+798 |
|\ | |||||
| * | Merge pull request #102 from xenda/master | Xenda | 2012-05-27 | 1 | -4/+4 |
| |\ | | | | | | | Small fix to update the README using more up to date conventions. | ||||
| * | | "a sql" -> "an SQL" per API documentation guidelines | Mark Rushakoff | 2012-05-27 | 1 | -1/+1 |
| | | | |||||
| * | | remove unnecessary ruby 1.8 reference from active_record/core [ci skip] | Francesco Rodriguez | 2012-05-26 | 1 | -3/+4 |
| | | | |||||
| * | | add CollectionProxy#uniq documentation | Francesco Rodriguez | 2012-05-26 | 1 | -0/+21 |
| | | | |||||
| * | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-26 | 1 | -2/+188 |
| |\ \ | |||||
| | * | | add :nodoc: to CollectionProxy#initialize | Francesco Rodriguez | 2012-05-25 | 1 | -1/+1 |
| | | | | |||||
| | * | | add CollectionProxy#== documentation | Francesco Rodriguez | 2012-05-25 | 1 | -0/+24 |
| | | | | |||||
| | * | | add CollectionProxy#count documentation | Francesco Rodriguez | 2012-05-25 | 1 | -0/+26 |
| | | | | |||||
| | * | | add CollectionProxy#to_ary documentation | Francesco Rodriguez | 2012-05-25 | 1 | -2/+35 |
| | | | | |||||
| | * | | add CollectionProxy#delete documentation | Francesco Rodriguez | 2012-05-25 | 1 | -1/+104 |
| | | | | |||||
| * | | | Merge pull request #4132 from Juanmcuello/clone_structure | Aaron Patterson | 2012-05-25 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | Reset postgreSQL search path in db:test:clone_structure. | ||||
| | * | | | Reset postgreSQL search path in db:test:clone_structure. | Juan M. Cuello | 2011-12-22 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch resets the postgres search path in the structure.sql after the structure is dumped in order to find schema_migrations table when multiples schemas are used. Fixes #945 | ||||
| * | | | | Merge pull request #5872 from evtuhovich/prepared_statement_fix | Aaron Patterson | 2012-05-25 | 1 | -10/+10 |
| |\ \ \ \ | | | | | | | | | | | | | Remove prepared statement from system query in postgresql adapter | ||||
| | * | | | | Remove prepared statement from system query in postgresql adapter | Ivan Evtukhovich | 2012-05-12 | 1 | -10/+10 |
| | | | | | | |||||
| * | | | | | Merge pull request #5244 from fotos/myqsl2_wait_timeout | Rafael Mendonça França | 2012-05-25 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Maximum wait_timeout on Windows is 2147483 | ||||
| | * | | | | | Maximum wait_timeout on Windows is 2147483 | Fotos Georgiadis | 2012-03-02 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #5925 from Juanmcuello/pg_structure_dump | Carlos Antonio da Silva | 2012-05-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quote arguments in db:structure:dump for PostgreSQL. | ||||
| * | | | | | | Whitespaces :scissors: | Rafael Mendonça França | 2012-05-23 | 2 | -7/+7 |
| | | | | | | | |||||
| * | | | | | | PGconn doesn't accepts :checkout_timeout option. | Rafael Mendonça França | 2012-05-23 | 1 | -1/+1 |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option was added on cb6f839359bd894feb0a1105b79af72b336aa41e renaming the :wait_timeout option. Fix build http://travis-ci.org/#!/rails/rails/jobs/1413405 | ||||
| * | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-23 | 3 | -34/+463 |
| |\ \ \ \ \ | |||||
| | * | | | | | copy edits in collection proxy docs [ci skip] | Vijay Dev | 2012-05-23 | 1 | -25/+18 |
| | | | | | | | |||||
| | * | | | | | Revert "Remove blank trailing comments" | Vijay Dev | 2012-05-23 | 21 | -0/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a. Reason: Not a fan of such massive changes. We usually close such changes if made to Rails master as a pull request. Following the same principle here and reverting. [ci skip] | ||||
| | * | | | | | add CollectionProxy#length documentation | Francesco Rodriguez | 2012-05-22 | 1 | -5/+37 |
| | | | | | | | |||||
| | * | | | | | add CollectionProxy#size documentation | Francesco Rodriguez | 2012-05-22 | 1 | -2/+25 |
| | | | | | | | |||||
| | * | | | | | add :call-seq: to +first+ and +last+ CollectionProxy methods | Francesco Rodriguez | 2012-05-22 | 1 | -0/+6 |
| | | | | | | | |||||
| | * | | | | | add CollectionProxy#create! documentation | Francesco Rodriguez | 2012-05-22 | 1 | -0/+22 |
| | | | | | | | |||||
| | * | | | | | add CollectionProxy#create documentation | Francesco Rodriguez | 2012-05-22 | 1 | -0/+33 |
| | | | | | | | |||||
| | * | | | | | add more examples to CollectionProxy#find | Francesco Rodriguez | 2012-05-22 | 1 | -0/+9 |
| | | | | | | | |||||
| | * | | | | | adding :call-seq: to CollectionProxy methods | Francesco Rodriguez | 2012-05-22 | 1 | -0/+39 |
| | | | | | | | |||||
| | * | | | | | add CollectionProxy#build documentation | Francesco Rodriguez | 2012-05-22 | 1 | -0/+31 |
| | | | | | | | |||||
| | * | | | | | remove repeated documentation in CollectionProxy#clear | Francesco Rodriguez | 2012-05-22 | 1 | -24/+2 |
| | | | | | | | |||||
| | * | | | | | update CollectionProxy#clear documentation | Francesco Rodriguez | 2012-05-21 | 1 | -3/+2 |
| | | | | | | | |||||
| | * | | | | | update CollectionProxy#delete_all documentation | Francesco Rodriguez | 2012-05-21 | 1 | -2/+29 |
| | | | | | | | |||||
| | * | | | | | add CollectionProxy#delete_all documentation | Francesco Rodriguez | 2012-05-21 | 1 | -0/+65 |
| | | | | | | | |||||
| | * | | | | | Fix AR preloader example | Alexey Vakhov | 2012-05-22 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | fix CollectionProxy documentation markup | Francesco Rodriguez | 2012-05-21 | 1 | -8/+8 |
| | | | | | | | |||||
| | * | | | | | add CollectionProxy#reload documentation | Francesco Rodriguez | 2012-05-21 | 1 | -0/+18 |
| | | | | | | | |||||
| | * | | | | | improve CollectionProxy#destroy documentation | Francesco Rodriguez | 2012-05-21 | 1 | -5/+37 |
| | | | | | | | |||||
| | * | | | | | add CollectionProxy#destroy documentation | Francesco Rodriguez | 2012-05-21 | 1 | -1/+42 |
| | | | | | | | |||||
| | * | | | | | update CollectionProxy#destroy_all documentation | Francesco Rodriguez | 2012-05-20 | 1 | -1/+9 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #6462 from grosser/feature/licenses | José Valim | 2012-05-23 | 1 | -0/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add license field to gemspecs, by Matt Griffin | ||||
| | * | | | | | | Add license field to gemspecs, by Matt Griffin | Matt Griffin | 2012-05-23 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | ConnectionPool wait_timeout no longer used for different types of timeouts. ↵ | Jonathan Rochkind | 2012-05-23 | 4 | -12/+21 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #6441 An AR ConnectionSpec `wait_timeout` is pre-patch used for three different things: * mysql2 uses it for MySQL's own wait_timeout (how long MySQL should allow an idle connection before closing it), and defaults to 2592000 seconds. * ConnectionPool uses it for "number of seconds to block and wait for a connection before giving up and raising a timeout error", default 5 seconds. * ConnectionPool uses it for the Reaper, for deciding if a 'dead' connection can be reaped. Default 5 seconds. Previously, if you want to change these from defaults, you need to change them all together. This is problematic _especially_ for the mysql2/ConnectionPool conflict, you will generally _not_ want them to be the same, as evidenced by their wildly different defaults. This has caused real problems for people #6441 #2894 But as long as we're changing this, forcing renaming the ConnectionPool key to be more specific, it made sense to seperate the two ConnectionPool uses too -- these two types of ConnectionPool timeouts ought to be able to be changed independently, you won't neccesarily want them to be the same, even though the defaults are (currently) the same. | ||||
| * | | | | | | changed xml type datetime to dateTime, fixes #6328 | Angelo capilleri | 2012-05-23 | 2 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | XmlMini define the xml 'datatime', but according to http://www.w3.org/TR/xmlschema-2/#dateTime could be better change this to 'dateTime' with upper case letter 'T. So 'DateTime' and 'Time' are redefined from 'datetime' to 'dateTime' add the changing to the changelog | ||||
| * | | | | | | Revert "Merge pull request #6416 from pmahoney/threadsafe-connection-pool" | Rafael Mendonça França | 2012-05-22 | 3 | -202/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d2901f0fc4270a765717ad572d559dc49a56b3a8, reversing changes made to 525839fdd8cc34d6d524f204528d5b6f36fe410c. Conflicts: activerecord/test/cases/connection_pool_test.rb Reason: This change broke the build (http://travis-ci.org/#!/rails/rails/builds/1391490) and we don't have any solution until now. I asked the author to try to fix it and open a new pull request. | ||||
| * | | | | | | Fix the build | Santiago Pastorino | 2012-05-22 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | require active_support/lazy_load_hooks where is needed | Santiago Pastorino | 2012-05-22 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #6368 from Antiarchitect/store-indifferent-access | Jeremy Kemper | 2012-05-22 | 2 | -10/+61 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Support migrating from Hash to HashWithIndifferentAccess for accessing attributes. | ||||
| | * | | | | | | Convert Hash to HashWithIndifferentAccess in ActiveRecord::Store. | Andrey Voronkov | 2012-05-22 | 2 | -10/+61 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to make migration from 3.x apps easier, we should try to convert Hash instances to HashWithIndifferentAccess, to allow accessing values with both symbol and a string. This is follow up to changes in 3c0bf043. |