aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
...
| | * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-071-1/+1
| | |\
| | | * "SSL everywhere" for GitHub URLsAkira Matsuda2011-03-071-1/+1
| | * | Referencing a table via the ON condition in a join should force that table to...Jon Leighton2011-03-072-1/+27
| | |/
| * | 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
| * | 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-0511-15/+33
| |\|
| | * use Arel::Table#alias rather than passing the :as parameterAaron Patterson2011-03-052-4/+4
| | * Active Record typos.R.T. Lechow2011-03-056-10/+10
| | * fixes a missmatched column in examplemjy2011-03-051-1/+1
| | * implements ActiveRecord::Base.connection_config to be able to check the confi...Xavier Noria2011-03-053-0/+18
| | * When preloading has_and_belongs_to_many associations, we should only instanti...Jon Leighton2011-03-042-2/+20
| | * Fix a couple of tests in join_model_test.rb which were failing when the ident...Jon Leighton2011-03-041-2/+2
| * | 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-042-4/+5
| |\|
| * | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-04207-5362/+9286
| |\ \
| * \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-12-1265-420/+756
| |\ \ \
| * \ \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-11-2756-911/+1611
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-11-1760-287/+461
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-11-0822-134/+144
| |\ \ \ \ \ \
| * | | | | | | 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-3110-34/+113
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-2839-209/+811
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Rename nested_has_many_through_associations_test.rb because it does not only ...Jon Leighton2010-10-191-1/+1
| * | | | | | | | | Add explicit ordering in relations_test.rb, as the lack of this was causing f...Jon Leighton2010-10-191-9/+9
| * | | | | | | | | Add explicit ordering to nested_has_many_through_associations_test.rb as this...Jon Leighton2010-10-191-32/+37
| * | | | | | | | | Remove obsolete require to active_record/associations/nested_has_many_throughJon Leighton2010-10-191-1/+0
| * | | | | | | | | Fix typoJon Leighton2010-10-191-1/+1
| * | | | | | | | | Remove obsolete autoloadJon Leighton2010-10-191-1/+0
| * | | | | | | | | Add a CHANGELOG entry about nested through associationsJon Leighton2010-10-191-0/+2
| * | | | | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-1913-44/+65
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add some API documentation about nested through associationsJon Leighton2010-10-191-8/+52
| * | | | | | | | | | Add some comments for ThroughReflection#through_reflection_chainJon Leighton2010-10-191-1/+10
| * | | | | | | | | | Remove various comments and code which were just being used during the develo...Jon Leighton2010-10-195-199/+0
| * | | | | | | | | | Add explicit tests for the nested through association changes in reflection.rbJon Leighton2010-10-195-2/+80
| * | | | | | | | | | Fix broken testJon Leighton2010-10-191-1/+5
| * | | | | | | | | | Small refactoringJon Leighton2010-10-191-6/+2
| * | | | | | | | | | Support the :primary_key option on a through reflection in a nested through a...Jon Leighton2010-10-196-7/+32
| * | | | | | | | | | Bugfix/refactoringJon Leighton2010-10-193-11/+20
| * | | | | | | | | | Remove unused methodsJon Leighton2010-10-191-11/+0