aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-182-8/+69
| |\| | |
| | * | | define_attr_method should be able to define methods that returns nilSantiago Pastorino2011-03-172-2/+4
| | * | | remove misleading commentAaron Patterson2011-03-171-2/+0
| | * | | dup strings on return so that in place modifications do not break anything. ...Aaron Patterson2011-03-172-1/+12
| | * | | define_attr_method correctly defines methods with invalid identifiersSantiago Pastorino2011-03-162-5/+6
| | * | | Add a define_attr_method testSantiago Pastorino2011-03-161-0/+13
| | * | | Add test for define_attr_method using as name an invalid identifierSantiago Pastorino2011-03-161-0/+13
| | * | | Add test for define_attribute_method using as name an invalid identifierSantiago Pastorino2011-03-161-3/+26
| * | | | Add order clauses to fix some tests which were failing under 1.8 on oracle an...Jon Leighton2011-03-182-14/+14
| * | | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-1630-81/+164
| |\| | |
| | * | | fixes an issue with number_to_human when converting values which are less tha...Josh Kalderimis2011-03-162-2/+4
| | * | | Fix typo in assertion messageAndrew White2011-03-161-1/+1
| | * | | Add messages to plain assertions.Norman Clarke2011-03-151-2/+2
| | * | | use a list to represent the supported verbs for a route objectAaron Patterson2011-03-142-11/+13
| | * | | stop splatting arguments so that we can understand wtf is going onAaron Patterson2011-03-141-2/+3
| | * | | RegexpWithNamedGroups is only used for path_info, so only apply to path infoAaron Patterson2011-03-141-1/+2
| * | | | oracle, y u defy meJon Leighton2011-03-165-13/+15
| * | | | Fix tests under postgres - we should always put conditions in the WHERE part ...Jon Leighton2011-03-124-19/+23
| * | | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-128-20/+117
| |\ \ \ \
| * | | | | Resolve some TODO comments which I decided did not need anything doneJon Leighton2011-03-123-9/+5
| * | | | | Simplify implementation of ThroughReflection#chainJon Leighton2011-03-112-23/+3
| * | | | | Abstract some common code from AssociationScope and JoinDependency::JoinAssoc...Jon Leighton2011-03-114-97/+83
| * | | | | Refactor JoinAssociationJon Leighton2011-03-101-100/+54
| * | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-1049-129/+231
| |\ \ \ \ \
| * | | | | | Rename Reflection#through_reflection_chain and #through_options to Reflection...Jon Leighton2011-03-105-50/+53
| * | | | | | Move the code which builds a scope for through associations into a generic As...Jon Leighton2011-03-109-215/+162
| * | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-0725-44/+193
| |\ \ \ \ \ \
| * | | | | | | Fix test_has_many_association_through_a_has_many_association_with_nonstandard...Jon Leighton2011-03-072-2/+2
| * | | | | | | Referencing a table via the ON condition in a join should force that table to...Jon Leighton2011-03-072-1/+27
| * | | | | | | Refactor ThroughAssociation#join_to to be much smaller, and independent of co...Jon Leighton2011-03-062-84/+34
| * | | | | | | Refactor ThroughAssociation#tables to just be a flat array of tables in the o...Jon Leighton2011-03-061-75/+70
| * | | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-0563-117/+380
| |\ \ \ \ \ \ \
| * | | | | | | | Use Base#type_condition in JoinAssociationJon Leighton2011-03-052-17/+6
| * | | | | | | | Push source_type and polymorphic conditions out of ThroughAssociation and Joi...Jon Leighton2011-03-054-47/+13
| * | | | | | | | Add a test for STI on the through where the through is nested, and change the...Jon Leighton2011-03-056-13/+46
| * | | | | | | | Stop identity-mapping the through records in the preloader since I fixed the ...Jon Leighton2011-03-041-5/+0
| * | | | | | | | Fix a couple of tests in join_model_test.rb which were failing when the ident...Jon Leighton2011-03-041-2/+2
| * | | | | | | | When preloading has_and_belongs_to_many associations, we should only instanti...Jon Leighton2011-03-042-2/+20
| * | | | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-045-9/+28
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-04584-13369/+18299
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-12-12149-1249/+2445
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-11-27171-1857/+3057
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-11-17196-1793/+3968
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-11-0852-185/+381
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update new tests in cascaded_eager_loading_test.rb to work with the modified ...Jon Leighton2010-10-311-6/+6
| * | | | | | | | | | | | | Fix bug with 0bb85ed9ffa9808926b46e8f7e59cab5b85ac19f which missed out a fixt...Jon Leighton2010-10-311-1/+2
| * | | | | | | | | | | | | Fix naughty trailing whitespaceJon Leighton2010-10-3121-259/+259
| * | | | | | | | | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-3116-43/+121
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-28116-632/+6546
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Rename nested_has_many_through_associations_test.rb because it does not only ...Jon Leighton2010-10-191-1/+1