aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-02-251-1/+1
|\
| * Fix missing inheritance from AR::Base in docsJosep M. Bach2011-02-241-1/+1
* | fixes: ActiveRecord::Base.scopes includes all scopes defined in all subclassesEric Allam2011-02-242-2/+7
* | observers leak across tests, so rather than modify the object, we should just...Aaron Patterson2011-02-231-6/+12
* | Fix observer callbacks firing multiple times on descendant instancesKamal Fariz Mahyuddin2011-02-222-1/+22
* | We're in 2011, let's update our licensePrem Sichanugrist2011-02-222-2/+2
* | expectations change when using IM. Change oracle tests to reflect thatAaron Patterson2011-02-221-2/+6
* | Relation will delegate to AR::Base which already uses the Dynamic finders, so...Aaron Patterson2011-02-221-8/+3
|/
* adding a test case for custom lockingAaron Patterson2011-02-211-0/+17
* Use proper objects to do the work to build the associations (adding methods, ...Jon Leighton2011-02-2115-418/+553
* Rename target_klass to klassJon Leighton2011-02-213-10/+10
* Delegate through_reflection and source_reflection to reflectionJon Leighton2011-02-213-34/+34
* Delegate Association#options to the reflection, and replace 'reflection.optio...Jon Leighton2011-02-218-47/+57
* Singular associations no longer use a proxy, so no need to check for the prox...Jon Leighton2011-02-213-8/+2
* Associations - where possible, call attributes methods rather than directly a...Jon Leighton2011-02-2111-179/+179
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-02-214-4/+28
|\
| * copy-edits 8d96b89Xavier Noria2011-02-212-8/+10
| * Adding new examples for update_all methodRodrigo Navarro2011-02-201-0/+6
| * Adding examplesRodrigo Navarro2011-02-201-0/+2
| * Tpyo: fixing several cases of the theNicholas Rowe2011-02-191-1/+1
| * Typo: fixing the theNicholas Rowe2011-02-191-1/+1
| * Clarification of ActiveRecord ActiveModel validation documentationPeer Allan2011-02-182-2/+16
* | instance_methods includes public and protected, so reduce funcalls and object...Aaron Patterson2011-02-181-3/+2
* | oops, no need for puts!Aaron Patterson2011-02-181-1/+0
* | AR::AttributeMethods does not need to be included in an AR::Base class.Aaron Patterson2011-02-182-1/+67
* | fixes a merge conflictXavier Noria2011-02-191-10/+0
|/
* merges docrailsXavier Noria2011-02-185-9/+16
|\
| * removes unrealistic example (authentication plus gender?), that it is not nee...Xavier Noria2011-02-181-4/+1
| * Clarify Example in ActiveRecord baseNicholas Rowe2011-02-181-1/+1
| * Fix Typos: remove several occurences of the theNicholas Rowe2011-02-173-3/+3
| * commas to set off expressions that interrupt sentence flowgenlinux2011-02-171-3/+3
* | Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-182-9/+1
|\ \
| * | Remove test which was broken on 1.8. This test is now irrelevant since singul...Jon Leighton2011-02-181-8/+0
| * | just use the list of column names to generate attribute methodsAaron Patterson2011-02-181-1/+1
* | | Don't use skip, just don't run anything, we don't have skip in Ruby 1.8Emilio Tagua2011-02-182-8/+4
* | | No need to have reinit_with inside an InstanceMethods module.Emilio Tagua2011-02-181-17/+15
* | | Initialize @target instead asking if it is defined.Emilio Tagua2011-02-181-1/+2
* | | Should use "=" instead "replace" after this commit: 1644663ba7f678d178deab2bf...Emilio Tagua2011-02-181-1/+1
* | | No need to test agaisnt target.Emilio Tagua2011-02-181-1/+1
* | | Reindent and remove wrong line left in merge by mistake.Emilio Tagua2011-02-181-4/+3
* | | Use to_a instead :load in test, since :load changed.Emilio Tagua2011-02-181-1/+1
* | | No need to test against target anymore.Emilio Tagua2011-02-181-8/+8
* | | Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-1838-771/+833
|\| |
| * | Split AssociationProxy into an Association class (and subclasses) which manag...Jon Leighton2011-02-1826-502/+392
| * | Add :nodoc: to ThroughAssociation and HasOneAssociationJon Leighton2011-02-182-2/+2
| * | Allow building and then later saving has_many :through records, such that the...Jon Leighton2011-02-187-12/+124
| * | Ensure that association_ids uses the correct attribute where the association ...Jon Leighton2011-02-184-2/+20
| * | explicitly allowing lolqueriesAaron Patterson2011-02-162-13/+11
| * | use the arel table rather than generating stringsAaron Patterson2011-02-161-1/+1
| * | no need for Array.wrapAaron Patterson2011-02-161-1/+1