aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* move apply_finder_options to active_record_deprecated_findersJon Leighton2012-04-121-22/+0
* add active_record_deprecated_finders as a depJon Leighton2012-04-122-0/+3
* Merge pull request #5720 from kennyj/should_use_klass_methodJon Leighton2012-04-112-1/+2
|\
| * Get a properly aliased_table_name, when we use a polymorphic association.kennyj2012-04-042-1/+2
* | Override AR::Relation methods in NullRelation.Juanjo Bazán2012-04-112-0/+86
* | Corrected grammatical errors in schema_dumper and scoping/defaultdcurtis2012-04-102-2/+2
* | Fix delete_all when chained with joins.Rafael Mendonça França2012-04-104-17/+59
* | Merge pull request #5718 from benedikt/masterJeremy Kemper2012-04-084-6/+13
|\ \
| * | Adds test to check that circular preloading does not modify Model.unscoped (a...Benedikt Deicke2012-04-033-4/+8
| * | Removes caching from ActiveRecord::Core::ClassMethods#relationBenedikt Deicke2012-04-033-6/+9
| |/
* | fix markup error [ci skip]Vijay Dev2012-04-081-1/+1
* | Merge pull request #5716 from jurriaan/tr-gsub-cleanupSantiago Pastorino2012-04-042-3/+3
|\ \
| * | Updated/changed useless tr/gsubsJurriaan Pruis2012-04-032-3/+3
| |/
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-041-3/+3
|\ \
| * | Remove unnecessary articles.Waseem Ahmad2012-04-031-3/+3
| |/
* | DATABASE_URL allows omission of database.ymlTim Pope2012-04-031-1/+3
* | use File.binread to pull in the schema cacheAaron Patterson2012-04-031-1/+1
|/
* 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