aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Expand)AuthorAgeFilesLines
* minor comment revisionXavier Noria2012-06-011-1/+1
* improve readability of AR explain resultAkira Matsuda2012-06-011-1/+7
* unused method argumentsAkira Matsuda2012-06-011-7/+6
* modulize AR::NullRelationAkira Matsuda2012-06-012-3/+3
* Merge branch 'master-sec'Aaron Patterson2012-05-312-3/+18
|\
| * predicate builder should not recurse for determining where columns.Aaron Patterson2012-05-302-3/+18
* | Psych is always available on 1.9Jeremy Kemper2012-05-312-29/+23
* | Fix wrong example for count method with block [ci skip]Carlos Antonio da Silva2012-05-311-1/+1
* | Work around undiagnosed bug that's draining a relation's bind_valuesJeremy Kemper2012-05-311-0/+1
* | Fix backward compatibility with stored Hash values. Wrap coders to convert se...Jeremy Kemper2012-05-301-2/+32
* | Merge pull request #6477 from steveklabnik/close_discovered_pg_connectionRafael Mendonça França2012-05-301-1/+2
|\ \
| * | Properly discover a connection is closed in postgresql_adapterSteve Klabnik2012-05-241-1/+2
* | | Merge pull request #5810 from kennyj/fix_5797Aaron Patterson2012-05-303-5/+6
|\ \ \
| * | | Fix #5797. Error calling dup method on AR model with serialized fieldkennyj2012-05-303-5/+6
* | | | Merge pull request #6386 from kennyj/fix_logs_name_consistencyAaron Patterson2012-05-303-18/+15
|\ \ \ \
| * | | | Fix logs name consistency.kennyj2012-05-193-18/+15
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-304-23/+33
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | copy edit the batches docs [ci skip]Vijay Dev2012-05-301-9/+7
| * | | | change example on CollectionProxy#delete to accept multiple valuesFrancesco Rodriguez2012-05-281-1/+1
| * | | | Adds to Batch processing documentation [ci skip]Alvaro Pereyra2012-05-281-9/+20
| * | | | fix typo and remove 'examples' noise [ci skip]Francesco Rodriguez2012-05-281-18/+6
| * | | | Updates examples for FinderMethods [ci skip]Alvaro Pereyra2012-05-281-2/+14
| * | | | Merge branch 'master' of github.com:lifo/docrailsAlvaro Pereyra2012-05-2827-86/+715
| |\ \ \ \
| | * | | | "a sql" -> "an SQL" per API documentation guidelinesMark Rushakoff2012-05-271-1/+1
| * | | | | Adds examples to FinderMethods#first [ci skip]Alvaro Pereyra2012-05-281-0/+1
* | | | | | Fix #5847 and #4045 on master.kennyj2012-05-301-0/+2
* | | | | | Use runner hook to load ActiveRecord::Base.kennyj2012-05-301-0/+4
* | | | | | SchemaMigration should be loaded lazily.kennyj2012-05-293-2/+1
* | | | | | Yield only one argument instead of splatting.Carlos Antonio da Silva2012-05-281-2/+2
* | | | | | Allow blocks for count with ActiveRecord::Relation. Document and test that su...chrisfinne2012-05-281-3/+14
* | | | | | Add support for CollectionAssociation#delete by Fixnum or StringFrancesco Rodriguez2012-05-282-0/+27
| |/ / / / |/| | | |
* | | | | remove unnecessary ruby 1.8 reference from active_record/core [ci skip]Francesco Rodriguez2012-05-261-3/+4
* | | | | add CollectionProxy#uniq documentationFrancesco Rodriguez2012-05-261-0/+21
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-261-2/+188
|\ \ \ \ \
| * | | | | add :nodoc: to CollectionProxy#initializeFrancesco Rodriguez2012-05-251-1/+1
| * | | | | add CollectionProxy#== documentationFrancesco Rodriguez2012-05-251-0/+24
| * | | | | add CollectionProxy#count documentationFrancesco Rodriguez2012-05-251-0/+26
| * | | | | add CollectionProxy#to_ary documentationFrancesco Rodriguez2012-05-251-2/+35
| * | | | | add CollectionProxy#delete documentationFrancesco Rodriguez2012-05-251-1/+104
* | | | | | Merge pull request #4132 from Juanmcuello/clone_structureAaron Patterson2012-05-251-0/+1
|\ \ \ \ \ \
| * | | | | | Reset postgreSQL search path in db:test:clone_structure.Juan M. Cuello2011-12-221-0/+1
* | | | | | | Merge pull request #5872 from evtuhovich/prepared_statement_fixAaron Patterson2012-05-251-10/+10
|\ \ \ \ \ \ \
| * | | | | | | Remove prepared statement from system query in postgresql adapterIvan Evtukhovich2012-05-121-10/+10
* | | | | | | | Merge pull request #5244 from fotos/myqsl2_wait_timeoutRafael Mendonça França2012-05-251-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Maximum wait_timeout on Windows is 2147483Fotos Georgiadis2012-03-021-1/+1
* | | | | | | | | Merge pull request #5925 from Juanmcuello/pg_structure_dumpCarlos Antonio da Silva2012-05-241-2/+2
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Whitespaces :scissors:Rafael Mendonça França2012-05-232-7/+7
* | | | | | | | PGconn doesn't accepts :checkout_timeout option.Rafael Mendonça França2012-05-231-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | 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