aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-192-11/+293
|\
| * copy edits [ci skip]Vijay Dev2012-05-191-17/+20
| * add CollectionProxy#last documentationFrancesco Rodriguez2012-05-191-0/+27
| * add CollectionProxy#first documentationFrancesco Rodriguez2012-05-191-0/+27
| * improve CollectionProxy#concat documentationFrancesco Rodriguez2012-05-191-7/+18
| * fix CollectionProxy#<< documentationFrancesco Rodriguez2012-05-191-1/+1
| * add CollectionProxy#<< documentationFrancesco Rodriguez2012-05-191-0/+20
| * add CollectionProxy#clear documentationFrancesco Rodriguez2012-05-191-0/+26
| * add CollectionProxy#include? documentationFrancesco Rodriguez2012-05-181-0/+13
| * move docs from CollectionAssociation to CollectionProxyFrancesco Rodriguez2012-05-182-114/+143
| * remove incorrect example of CollectionAssociation#empty?Francesco Rodriguez2012-05-181-17/+0
| * add docs to CollectionAssociation#empty?Francesco Rodriguez2012-05-181-3/+32
| * add docs to CollectionAssociation#any?Francesco Rodriguez2012-05-181-0/+30
| * add examples to CollectionAssociation#concatFrancesco Rodriguez2012-05-181-3/+14
| * fix CollectionAssociation docsFrancesco Rodriguez2012-05-171-1/+1
| * add example to CollectionAssociation#destroy_allFrancesco Rodriguez2012-05-171-3/+14
| * add more explanation to CollectionAssociation docsFrancesco Rodriguez2012-05-171-0/+4
| * add CollectionAssociation hierarchyFrancesco Rodriguez2012-05-171-2/+7
| * add docs to CollectionAssociation#many?Francesco Rodriguez2012-05-171-1/+34
| * fix CollectionAssociation#replace docsFrancesco Rodriguez2012-05-171-3/+3
| * Add docs to CollectionAssociation#replaceFrancesco Rodriguez2012-05-171-3/+23
* | Merge pull request #4835 from pacoguzman/refactor_define_restrict_dependency_...Carlos Antonio da Silva2012-05-191-3/+3
|\ \
| * | Refactor define_restrict_dependency_method using reflectionPaco Guzman2012-02-011-3/+3
* | | Ensure that CollectionAssociation#replace returns proper targetPiotr Sarnacki2012-05-191-1/+1
* | | fix #delete_all with habtm with :delete_sqlJon Leighton2012-05-181-0/+1
* | | no longer need #delete_all_on_destroyJon Leighton2012-05-185-17/+2
* | | Perf: Don't load the association for #delete_all.Jon Leighton2012-05-184-10/+35
| |/ |/|
* | Merge pull request #5453 from JonRowe/patch_uniq_has_and_belongs_to_many_when...Aaron Patterson2012-05-161-2/+6
|\ \
| * | when using a preloaded array and the uniq flag is set then return the size of...Jon Rowe2012-03-151-2/+6
* | | Fix CollectionAssociation#replace to return new target (closes #6231)Piotr Sarnacki2012-05-161-0/+2
* | | Remove #=== quirkJon Leighton2012-05-111-6/+0
* | | this stuff can all be handled by RelationJon Leighton2012-05-111-38/+0
* | | extract deprecated codeJon Leighton2012-05-111-8/+1
* | | set_owner_attributes is covered by the scopingJon Leighton2012-05-111-4/+3
* | | CollectionProxy < RelationJon Leighton2012-05-112-22/+23
* | | Revert "Merge pull request #5494 from armstrjare/active_record_relation_keep_...Jon Leighton2012-05-052-7/+2
* | | Merge pull request #5494 from armstrjare/active_record_relation_keep_associat...Jon Leighton2012-05-052-2/+7
|\ \ \
| * | | Allow ActiveRecord::Relation merges to maintain context of joined associationsJared Armstrong2012-05-042-2/+7
* | | | extract code from AR::BaseJon Leighton2012-05-041-1/+1
* | | | clean up implementation of dynamic methods. use method compilation etc.Jon Leighton2012-05-041-3/+3
|/ / /
* | | Fix issue with private kernel methods and collection associations. Closes #2508Carlos Antonio da Silva2012-05-021-2/+2
* | | allow AssociationProxy#scoped to take options so that API is the same as Base...Jon Leighton2012-04-271-2/+6
* | | Merge remote-tracking branch 'jmbejar/define_array_methods_collection_proxy'Jon Leighton2012-04-251-0/+13
|\ \ \
| * | | Define array methods in ActiveRecord::Associations::CollectionProxyJorge Bejar2012-04-181-0/+13
* | | | Merge remote-tracking branch 'kennyj/fix_5563'Jon Leighton2012-04-254-4/+6
|\ \ \ \
| * | | | Fix #5563. Should reflect the most recent change to either of association / id.kennyj2012-04-131-1/+2
| * | | | @stale_state should be nil when a model isn't saved.kennyj2012-04-133-3/+4
* | | | | remove apply_finder_options call from AssociationScopeJon Leighton2012-04-131-7/+8
|/ / / /
* | | | Some refactor for association.kennyj2012-04-123-8/+7
* | | | Get a properly aliased_table_name, when we use a polymorphic association.kennyj2012-04-041-1/+1
|/ / /