aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsOscar Del Ben2012-04-28124-2556/+2044
|\
| * Correct small consistency issue in AR querying guideMatthias Schmidt2012-04-281-1/+1
| * Code-format references to config settingsMark Rushakoff2012-04-277-7/+7
| * Update guides - run single test for AR testingAlexey Vakhov2012-04-281-0/+6
| * Update contributing guide - run single testAlexey Vakhov2012-04-281-0/+7
| * Update AM exampleAlexey Vakhov2012-04-281-3/+3
| * More using <tt>x</tt> instead of +x+ when the latter renders improperly.Mark Rushakoff2012-04-273-4/+4
| * Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-2820-27/+219
| |\
| * | update docs - disabling prepared statements is not connected to managing conn...Vijay Dev2012-04-281-1/+2
| * | add a factory method for queue construction so that apps can have multiple qu...Aaron Patterson2012-04-272-1/+13
| * | Merge pull request #5698 from dougcole/support_postgresql_partitioningAaron Patterson2012-04-275-11/+102
| |\ \
| | * | refactor configuration of insert_returningDoug Cole2012-04-072-33/+19
| | * | pick better names and add a little documentationDoug Cole2012-04-012-16/+24
| | * | improve test coverageDoug Cole2012-03-311-0/+26
| | * | refactorDoug Cole2012-03-311-13/+8
| | * | update mysql for new exec_insert signatureDoug Cole2012-03-311-1/+1
| | * | add use_returning as a postgresql connection configDoug Cole2012-03-314-8/+84
| * | | remove deprecated callsJon Leighton2012-04-2712-94/+93
| * | | Revert "Merge pull request #5995 from kennyj/fix_5847-3"José Valim2012-04-272-27/+0
| * | | Merge pull request #5989 from arunagw/warning_removed_master_apJon Leighton2012-04-271-3/+3
| |\ \ \
| | * | | Shadowing variable warning removedArun Agrawal2012-04-261-3/+3
| * | | | more deprecations manually fixedJon Leighton2012-04-273-58/+53
| * | | | find and replace deprecated keysJon Leighton2012-04-2721-220/+220
| * | | | allow AssociationProxy#scoped to take options so that API is the same as Base...Jon Leighton2012-04-272-2/+10
| * | | | %s/find(:\(first\|last\|all\), \([^()]*\))/scoped(\2).\1/gcI amongst other th...Jon Leighton2012-04-2730-415/+333
| * | | | remove unnecessary test codeJon Leighton2012-04-272-9/+1
| * | | | Merge branch 'master' of github.com:rails/railsJon Leighton2012-04-2723-564/+885
| |\ \ \ \
| | * \ \ \ Merge pull request #6011 from aderyabin/nosqliteJon Leighton2012-04-277-552/+543
| | |\ \ \ \
| | | * | | | fix tests for SQLite3AdapterAndrey Deryabin2012-04-274-4/+3
| | | * | | | renamed class SQLiteColumn to SQLite3ColumnAndrey Deryabin2012-04-271-3/+3
| | | * | | | removed tail of old sqlite versionsAndrey Deryabin2012-04-271-9/+9
| | | * | | | fix SQLite3Adapter docAndrey Deryabin2012-04-271-2/+2
| | | * | | | Upgrade sqlite3 version to 1.3.6Andrey Deryabin2012-04-271-1/+1
| | | * | | | fix tests for sqlite3Andrey Deryabin2012-04-271-1/+1
| | | * | | | merged sqlite and sqlite3 adaptersAndrey Deryabin2012-04-272-546/+538
| | |/ / / /
| | * | | | Missing git add :trollface:Yehuda Katz2012-04-264-0/+288
| | * | | | Initial queue implementationYehuda Katz2012-04-268-3/+45
| | * | | | Merge pull request #6004 from lest/patch-1Jon Leighton2012-04-261-2/+2
| | |\ \ \ \
| | | * | | | remove calls to deprecated find(:first) in actionpack test suiteSergey Nartimov2012-04-261-2/+2
| | |/ / / /
| | * | | | Merge pull request #6002 from lest/patch-1Jeremy Kemper2012-04-262-4/+4
| | |\ \ \ \
| | | * | | | refactor content_tag_for helperSergey Nartimov2012-04-261-3/+3
| | | * | | | use safe_join in number helperSergey Nartimov2012-04-261-1/+1
| | |/ / / /
| | * | | | Merge pull request #6001 from nashby/patch-2Jeremy Kemper2012-04-261-3/+3
| | |\ \ \ \
| | | * | | | remove unnecessary else statementVasiliy Ermolovich2012-04-261-3/+3
| | |/ / / /
| * / / / / don't need this testJon Leighton2012-04-261-5/+0
| |/ / / /
| * | | | remove calls to find(:first), find(:last) and find(:all)Jon Leighton2012-04-2627-119/+114
| * | | | remove deprecate #all usageJon Leighton2012-04-264-7/+3
| * | | | remove deprecated #first callsJon Leighton2012-04-263-28/+3
| * | | | remove deprecate #calculate callsJon Leighton2012-04-2611-146/+72
| * | | | remove deprecated #find_in_batches callsJon Leighton2012-04-262-15/+3