aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Fix #5667. Preloading should ignore scoping.Jon Leighton2012-03-302-2/+14
* clear up duplication between Persistence#destroy and Locking#destroyJon Leighton2012-03-302-27/+34
* fix testJon Leighton2012-03-301-1/+2
* whitespace :scissors:Jon Leighton2012-03-302-5/+4
* Merge pull request #5334 from courtland/masterJon Leighton2012-03-305-1/+27
|\
| * Tests for removing a HABTM association when optimistic locking is enabled.Nick Rogers2012-03-074-1/+25
| * Fix deleting from a HABTM join table upon destroying an object of a model wit...Nick Rogers2012-03-071-0/+2
* | Add Relation#find_by and Relation#find_by!Jon Leighton2012-03-305-0/+78
* | Merge pull request #2945 from Casecommons/nested_attributes_moduleJon Leighton2012-03-303-1/+15
|\ \
| * | Nested attribute setters can be overridden.Jonathan Mukai & Peter Jaros2012-03-283-1/+15
* | | recurse in read_attribute we get caching / don't duplicate codeJon Leighton2012-03-301-3/+2
* | | Deprecate Column#type_cast_codeCarlos Antonio da Silva2012-03-292-4/+4
* | | Properly typecast id attribute when using custom primary keyCarlos Antonio da Silva2012-03-291-1/+4
* | | CHANGELOG entry for AR#sliceGuillermo Iguaran2012-03-291-0/+5
* | | Add ActiveRecord::Base#slice to slice method callsGuillermo Iguaran2012-03-292-0/+18
* | | Merge pull request #4843 from seamusabshere/patch-1Xavier Noria2012-03-281-1/+1
|\ \ \ | |/ / |/| |
| * | thanks to @jurriaanSeamus Abshere2012-02-141-1/+1
| * | Possibly clearer way of getting rid of ` and " Seamus Abshere2012-02-011-1/+1
* | | much code can be deleted thanks to @tenderlove's refactoringJon Leighton2012-03-283-72/+6
* | | Merge pull request #5616 from cbartlett/migration-indentSantiago Pastorino2012-03-271-2/+2
|\ \ \
| * | | Fix indenting in migration generatorColin Bartlett2012-03-271-2/+2
* | | | Remove Arel::Relation constant from PredicateBuilder.Juanjo Bazán2012-03-271-2/+2
* | | | attributes are cached by string keys, so to_s to support symbols. fixes #5549Aaron Patterson2012-03-273-2/+17
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-272-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Missing generated query for pluck method. Juanjo Bazán2012-03-271-1/+1
| * | | Use one 'be'.Waseem Ahmad2012-03-241-1/+1
* | | | removed unused variablesArun Agrawal2012-03-271-2/+2
* | | | Merge pull request #5582 from chendo/masterXavier Noria2012-03-261-1/+1
|\ \ \ \
| * | | | Remove 'needless boolean casting'.Jack Chen (chendo)2012-03-261-1/+1
| |/ / /
* | | | Merge pull request #2621 from icco/masterAaron Patterson2012-03-261-1/+1
|\ \ \ \
| * | | | Not checking for nil is apparently a lot faster.Nat Welch2011-09-211-1/+1
| * | | | Merge branch 'master' of git://github.com/rails/railsNat Welch2011-09-2168-1714/+2129
| |\ \ \ \
| * | | | | From @dasch's recommendation.Nat Welch2011-08-221-1/+1
| * | | | | Fixes bug with schema dumper when using with Padrino.Nat Welch2011-08-211-1/+1
* | | | | | ActiveRecord::Coders::YAMLColumn#dump should raise an errorGuten2012-03-262-1/+14
| |_|/ / / |/| | | |
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-242-1/+15
|\ \ \ \ \
| * | | | | Adding documentation for ActiveRecord::Base.abstract_class to clarify a parti...Joe Goggins2012-03-221-0/+14
| * | | | | Correct description of ['migrated_at > ?', 1.week.ago] from "more than a week...Dave Burt2012-03-201-1/+1
* | | | | | properly namespace the fixture exceptionAaron Patterson2012-03-222-7/+3
* | | | | | Avoid another blank line in generated migration and remove assertion as per @...Marcelo Silveira2012-03-211-1/+1
* | | | | | Deprecate eager-evaluated scopes.Jon Leighton2012-03-2120-83/+159
* | | | | | Avoid obscure &Proc.new thingJon Leighton2012-03-211-2/+2
* | | | | | Remove valid_scope_name? check - use rubyJon Leighton2012-03-212-30/+1
* | | | | | no need for castJon Leighton2012-03-211-1/+0
* | | | | | no need for lvarJon Leighton2012-03-211-3/+1
* | | | | | Merge pull request #5532 from mhfs/migration_blank_lineJosé Valim2012-03-211-1/+1
|\ \ \ \ \ \
| * | | | | | Remove blank line from generated migrationMarcelo Silveira2012-03-201-1/+1
| |/ / / / /
* / / / / / Generate Migration Thats Adds Removed IndexTravis Jeffery2012-03-211-0/+3
|/ / / / /
* | | | | changed all.map to pluckSandeep2012-03-191-1/+1
* | | | | Merge pull request #3329 from armstrjare/autosave_collection_new_record_bugJosé Valim2012-03-182-1/+16
|\ \ \ \ \