| Commit message (Expand) | Author | Age | Files | Lines |
* | When preloading has_and_belongs_to_many associations, we should only instanti... | Jon Leighton | 2011-03-04 | 2 | -2/+20 |
* | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-04 | 2 | -4/+5 |
|\ |
|
| * | Move ActiveModel::AttributeMethods#attribute_methods_generated? to ActiveReco... | Alexander Uvarov | 2011-03-01 | 1 | -0/+11 |
* | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-04 | 207 | -5362/+9286 |
|\| |
|
| * | Move JoinDependency and friends from ActiveRecord::Associations::ClassMethods... | Jon Leighton | 2011-02-28 | 11 | -626/+618 |
| * | Rewrote AssociationPreload. | Jon Leighton | 2011-02-28 | 21 | -458/+583 |
| * | skip this on oracle | Aaron Patterson | 2011-02-28 | 1 | -0/+2 |
| * | use an attribute rather than a SQL literal | Aaron Patterson | 2011-02-26 | 2 | -1/+2 |
| * | removing limits and offsets from COUNT queries unless both are specified. [#6... | Aaron Patterson | 2011-02-25 | 4 | -1/+51 |
| * | only take the limit if there is a limit to take | Aaron Patterson | 2011-02-25 | 1 | -1/+1 |
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-02-25 | 1 | -1/+1 |
| |\ |
|
| | * | Fix missing inheritance from AR::Base in docs | Josep M. Bach | 2011-02-24 | 1 | -1/+1 |
| * | | fixes: ActiveRecord::Base.scopes includes all scopes defined in all subclasses | Eric Allam | 2011-02-24 | 2 | -2/+7 |
| * | | observers leak across tests, so rather than modify the object, we should just... | Aaron Patterson | 2011-02-23 | 1 | -6/+12 |
| * | | Fix observer callbacks firing multiple times on descendant instances | Kamal Fariz Mahyuddin | 2011-02-22 | 2 | -1/+22 |
| * | | We're in 2011, let's update our license | Prem Sichanugrist | 2011-02-22 | 2 | -2/+2 |
| * | | expectations change when using IM. Change oracle tests to reflect that | Aaron Patterson | 2011-02-22 | 1 | -2/+6 |
| * | | Relation will delegate to AR::Base which already uses the Dynamic finders, so... | Aaron Patterson | 2011-02-22 | 1 | -8/+3 |
| |/ |
|
| * | adding a test case for custom locking | Aaron Patterson | 2011-02-21 | 1 | -0/+17 |
| * | Use proper objects to do the work to build the associations (adding methods, ... | Jon Leighton | 2011-02-21 | 15 | -418/+553 |
| * | Rename target_klass to klass | Jon Leighton | 2011-02-21 | 3 | -10/+10 |
| * | Delegate through_reflection and source_reflection to reflection | Jon Leighton | 2011-02-21 | 3 | -34/+34 |
| * | Delegate Association#options to the reflection, and replace 'reflection.optio... | Jon Leighton | 2011-02-21 | 8 | -47/+57 |
| * | Singular associations no longer use a proxy, so no need to check for the prox... | Jon Leighton | 2011-02-21 | 3 | -8/+2 |
| * | Associations - where possible, call attributes methods rather than directly a... | Jon Leighton | 2011-02-21 | 11 | -179/+179 |
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-02-21 | 4 | -4/+28 |
| |\ |
|
| | * | copy-edits 8d96b89 | Xavier Noria | 2011-02-21 | 2 | -8/+10 |
| | * | Adding new examples for update_all method | Rodrigo Navarro | 2011-02-20 | 1 | -0/+6 |
| | * | Adding examples | Rodrigo Navarro | 2011-02-20 | 1 | -0/+2 |
| | * | Tpyo: fixing several cases of the the | Nicholas Rowe | 2011-02-19 | 1 | -1/+1 |
| | * | Typo: fixing the the | Nicholas Rowe | 2011-02-19 | 1 | -1/+1 |
| | * | Clarification of ActiveRecord ActiveModel validation documentation | Peer Allan | 2011-02-18 | 2 | -2/+16 |
| * | | instance_methods includes public and protected, so reduce funcalls and object... | Aaron Patterson | 2011-02-18 | 1 | -3/+2 |
| * | | oops, no need for puts! | Aaron Patterson | 2011-02-18 | 1 | -1/+0 |
| * | | AR::AttributeMethods does not need to be included in an AR::Base class. | Aaron Patterson | 2011-02-18 | 2 | -1/+67 |
| * | | fixes a merge conflict | Xavier Noria | 2011-02-19 | 1 | -10/+0 |
| |/ |
|
| * | merges docrails | Xavier Noria | 2011-02-18 | 5 | -9/+16 |
| |\ |
|
| | * | removes unrealistic example (authentication plus gender?), that it is not nee... | Xavier Noria | 2011-02-18 | 1 | -4/+1 |
| | * | Clarify Example in ActiveRecord base | Nicholas Rowe | 2011-02-18 | 1 | -1/+1 |
| | * | Fix Typos: remove several occurences of the the | Nicholas Rowe | 2011-02-17 | 3 | -3/+3 |
| | * | commas to set off expressions that interrupt sentence flow | genlinux | 2011-02-17 | 1 | -3/+3 |
| * | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-18 | 2 | -9/+1 |
| |\ \ |
|
| | * | | Remove test which was broken on 1.8. This test is now irrelevant since singul... | Jon Leighton | 2011-02-18 | 1 | -8/+0 |
| | * | | just use the list of column names to generate attribute methods | Aaron Patterson | 2011-02-18 | 1 | -1/+1 |
| * | | | Don't use skip, just don't run anything, we don't have skip in Ruby 1.8 | Emilio Tagua | 2011-02-18 | 2 | -8/+4 |
| * | | | No need to have reinit_with inside an InstanceMethods module. | Emilio Tagua | 2011-02-18 | 1 | -17/+15 |
| * | | | Initialize @target instead asking if it is defined. | Emilio Tagua | 2011-02-18 | 1 | -1/+2 |
| * | | | Should use "=" instead "replace" after this commit: 1644663ba7f678d178deab2bf... | Emilio Tagua | 2011-02-18 | 1 | -1/+1 |
| * | | | No need to test agaisnt target. | Emilio Tagua | 2011-02-18 | 1 | -1/+1 |
| * | | | Reindent and remove wrong line left in merge by mistake. | Emilio Tagua | 2011-02-18 | 1 | -4/+3 |