aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\
| * Merge branch 'master' of github.com:lifo/docrailsOscar Del Ben2012-04-2710-16/+16
| |\
| | * find_by_sql actually triggers after_findBernat Foj Capell2012-04-271-1/+1
| | |
| | * Fix it's -> itsMark Rushakoff2012-04-271-1/+1
| | |
| | * Use <tt>Foo::Bar</tt> instead of +Foo::Bar+Mark Rushakof2012-04-276-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | The latter doesn't render as code in HTML output. Regex used in Rubymine to locate the latter form: (\+)(:*\w+:(?::|\w)+)(\+)
| | * Active Support Core Extensions guide: reworded "on one hand" and similar to ↵Rory O’Kane2012-04-261-1/+1
| | | | | | | | | | | | "for one thing"
| | * Minor typo.Jonathan Roes2012-04-261-1/+1
| | |
| | * Fix misprints in assert_file & assert_instance_method docsAlexey Vakhov2012-04-261-4/+4
| | |
| * | Add delete post section to Getting Started guideOscar Del Ben2012-04-275-1/+80
| |/
| * minor docs improvementsOscar Del Ben2012-04-262-4/+4
| |
| * Add documentation for validate optionsOscar Del Ben2012-04-261-0/+13
| |
| * Enhance validations documentationOscar Del Ben2012-04-261-1/+1
| |
| * Merge branch 'master' of github.com:lifo/docrailsLes Nightingill2012-04-255-5/+105
| |\
| | * Copy EditJames Strocel2012-04-251-1/+1
| | |
| | * Merge branch 'master' of github.com:lifo/docrailsOscar Del Ben2012-04-2595-667/+873
| | |\
| | * | Add partials section to getting started guideOscar Del Ben2012-04-254-4/+104
| | | |
| * | | adds a mention of the fact that an engine's lib/assets directory is also on ↵Les Nightingill2012-04-251-1/+1
| | |/ | |/| | | | | | | the load path
* | | update docs - disabling prepared statements is not connected to managing ↵Vijay Dev2012-04-281-1/+2
| | | | | | | | | | | | connections externally [ci skip]
* | | add a factory method for queue construction so that apps can have multiple ↵Aaron Patterson2012-04-272-1/+13
| | | | | | | | | | | | queues
* | | Merge pull request #5698 from dougcole/support_postgresql_partitioningAaron Patterson2012-04-275-11/+102
|\ \ \ | | | | | | | | Support postgresql partitioning by making INSERT RETURNING optional
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Active Record should be lazy loaded and this pull request forced Active Record to always be loaded after initialization. This reverts commit 8cd14c0bc9f9429f03d1181912355d2f48b98157, reversing changes made to 2f0c8c52e66f1a2a3d1c00efc207f227124e96c2.
* | | | Merge pull request #5989 from arunagw/warning_removed_master_apJon Leighton2012-04-271-3/+3
|\ \ \ \ | | | | | | | | | | Shadowing variable warning removed
| * | | | 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 ↵Jon Leighton2012-04-272-2/+10
| | | | | | | | | | | | | | | | | | | | Base#scoped
* | | | | %s/find(:\(first\|last\|all\), \([^()]*\))/scoped(\2).\1/gcI amongst other ↵Jon Leighton2012-04-2730-415/+333
| | | | | | | | | | | | | | | | | | | | things
* | | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | Remove old sqlite adapter
| | * | | | | 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
| |/ / / / /