aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-281-24/+8
|\
| * fix AR::Associations::CollectionProxy#delete broken documentation [ci skip]Francesco Rodriguez2012-09-211-23/+2
| * update AR::Associations::CollectionProxy#loaded? documentation [ci skip]Francesco Rodriguez2012-09-211-1/+6
* | Fix destructive side effects from marshaling an association caused by 65843e1...Jeremy Kemper2012-09-251-5/+2
|/
* Merge pull request #7251 from rails/integrate-strong_parametersDavid Heinemeier Hansson2012-09-185-30/+29
|\
| * Remove mass_assignment_options from ActiveRecordGuillermo Iguaran2012-09-165-29/+29
| * Remove mass assignment security from ActiveRecordGuillermo Iguaran2012-09-161-1/+0
* | Merge pull request #7661 from ernie/build-join-records-on-unsaved-hmtRafael Mendonça França2012-09-171-0/+14
|\ \ | |/ |/|
| * Fix collection= on hm:t join models when unsavedErnie Miller2012-09-171-0/+14
* | Remove debug code :bomb:Rafael Mendonça França2012-09-161-1/+0
* | Don't preserve SELECT columns on COUNTSteve Klabnik2012-09-161-1/+2
|/
* Update documentation for CollectionProxyMarc-Andre Lafortune2012-09-121-8/+2
* Merge pull request #4976 from kreynolds/fix_eager_without_pkeyJon Leighton2012-09-071-1/+1
|\
| * Fix eagerly loading associations without primary keysKelley Reynolds2012-02-091-1/+1
* | Fix grammarJo Liss2012-08-301-3/+3
* | Use inversed parent for first and last child of has_many associationbrainopia2012-08-181-1/+1
* | Use method compilation for association methodsJon Leighton2012-08-105-64/+62
* | DRY up handling of dependent optionJon Leighton2012-08-105-63/+22
* | Unprivatise all the thingsJon Leighton2012-08-107-170/+156
* | move dependency logic out of generated methodsJon Leighton2012-08-107-65/+64
* | Clean up dependent option validation.Jon Leighton2012-08-104-14/+7
* | Remove the dependent_restrict_raises option.Jon Leighton2012-08-103-23/+22
* | Fix #7191. Remove unnecessary transaction when assigning has_one associations.kennyj2012-08-081-13/+15
* | removes usage of Object#in? from the code base (the method remains defined by...Xavier Noria2012-08-062-10/+13
* | Changing AR:CollectionAssociation#empty? to use #exists?beerlington2012-08-051-3/+11
* | load active_support/deprecation in active_support/railsXavier Noria2012-08-022-2/+0
* | load active_support/core_ext/object/inclusion in active_support/railsXavier Noria2012-08-025-5/+0
* | load active_support/core_ext/object/blank in active_support/railsXavier Noria2012-08-021-1/+0
* | s/scoped/scope/Jon Leighton2012-08-017-25/+31
* | Add CollectionProxy#scopeJon Leighton2012-08-011-1/+5
* | Use explicit delegationsJon Leighton2012-08-011-119/+79
* | Deprecate :finder_sql, :counter_sql, :insert_sql, :delete_sql.Jon Leighton2012-08-013-1/+22
* | Revert "Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql."Jon Leighton2012-08-017-35/+111
* | Refactor dependency check validationCarlos Antonio da Silva2012-08-014-28/+19
* | move method for dependent option checkHrvoje Šimić2012-08-014-11/+22
* | fix typo in collection proxyAccessd2012-07-311-1/+1
* | Deprecate Relation#all.Jon Leighton2012-07-271-1/+1
* | Deprecate ActiveRecord::Base.scoped.Jon Leighton2012-07-273-7/+3
* | Deprecate update_column in favor of update_columns.Rafael Mendonça França2012-07-241-1/+1
* | we don't need this argJon Leighton2012-07-201-2/+2
* | Remove :finder_sql, :counter_sql, :insert_sql, :delete_sql.Jon Leighton2012-07-207-111/+35
* | Remove obsolete line.Jon Leighton2012-07-201-1/+0
* | Convert association macros to the new syntaxJon Leighton2012-07-201-1/+1
* | Avoid options ever being nilJon Leighton2012-07-201-4/+4
* | fix association :extend optionJon Leighton2012-07-133-12/+19
* | move the deprecated options into active_record_deprecated_findersJon Leighton2012-07-132-5/+2
* | stop using class_attribute where methods/inheritance will suffice.Jon Leighton2012-07-137-29/+53
* | extract deprecated association options to active_record_deprecated_findersJon Leighton2012-07-131-43/+0
* | Represent association scope options as AR::Relations insternally.Jon Leighton2012-07-1312-127/+138
* | Allow associations to take a lambda which builds the scopeJon Leighton2012-07-133-13/+22