aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
Commit message (Collapse)AuthorAgeFilesLines
* Set the hash value directly instead of using merge!Carlos Antonio da Silva2012-06-211-1/+1
|
* Remove unneeded code since pluck is respecting joins nowRafael Mendonça França2012-06-191-12/+1
|
* Remove update_attribute.Steve Klabnik2012-06-141-1/+1
| | | | | | | | | | | Historically, update_attribute and update_attributes are similar, but with one big difference: update_attribute does not run validations. These two methods are really easy to confuse given their similar names. Therefore, update_attribute is being removed in favor of update_column. See the thread on rails-core here: https://groups.google.com/forum/?fromgroups#!topic/rubyonrails-core/BWPUTK7WvYA
* Merge branch 'master-sec'Aaron Patterson2012-05-311-2/+17
|\ | | | | | | | | | | * master-sec: Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this! predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
| * predicate builder should not recurse for determining where columns.Aaron Patterson2012-05-301-2/+17
| | | | | | | | | | | | Thanks to Ben Murphy for reporting this CVE-2012-2661
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-301-1/+1
|\ \
| * | change example on CollectionProxy#delete to accept multiple valuesFrancesco Rodriguez2012-05-281-1/+1
| | |
* | | Add support for CollectionAssociation#delete by Fixnum or StringFrancesco Rodriguez2012-05-282-0/+27
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I found the next issue between CollectionAssociation `delete` and `destroy`. class Person < ActiveRecord::Base has_many :pets end person.pets.destroy(1) # => OK, returns the destroyed object person.pets.destroy("2") # => OK, returns the destroyed object person.pets.delete(1) # => ActiveRecord::AssociationTypeMismatch person.pets.delete("2") # => ActiveRecord::AssociationTypeMismatch Adding support for deleting with a fixnum or string like `destroy` method.
* | add CollectionProxy#uniq documentationFrancesco Rodriguez2012-05-261-0/+21
| |
* | add :nodoc: to CollectionProxy#initializeFrancesco Rodriguez2012-05-251-1/+1
| |
* | add CollectionProxy#== documentationFrancesco Rodriguez2012-05-251-0/+24
| |
* | add CollectionProxy#count documentationFrancesco Rodriguez2012-05-251-0/+26
| |
* | add CollectionProxy#to_ary documentationFrancesco Rodriguez2012-05-251-2/+35
| |
* | add CollectionProxy#delete documentationFrancesco Rodriguez2012-05-251-1/+104
| |
* | copy edits in collection proxy docs [ci skip]Vijay Dev2012-05-231-25/+18
| |
* | Revert "Remove blank trailing comments"Vijay Dev2012-05-231-0/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a. Reason: Not a fan of such massive changes. We usually close such changes if made to Rails master as a pull request. Following the same principle here and reverting. [ci skip]
* | add CollectionProxy#length documentationFrancesco Rodriguez2012-05-221-5/+37
| |
* | add CollectionProxy#size documentationFrancesco Rodriguez2012-05-221-2/+25
| |
* | add :call-seq: to +first+ and +last+ CollectionProxy methodsFrancesco Rodriguez2012-05-221-0/+6
| |
* | add CollectionProxy#create! documentationFrancesco Rodriguez2012-05-221-0/+22
| |
* | add CollectionProxy#create documentationFrancesco Rodriguez2012-05-221-0/+33
| |
* | add more examples to CollectionProxy#findFrancesco Rodriguez2012-05-221-0/+9
| |
* | adding :call-seq: to CollectionProxy methodsFrancesco Rodriguez2012-05-221-0/+39
| |
* | add CollectionProxy#build documentationFrancesco Rodriguez2012-05-221-0/+31
| |
* | remove repeated documentation in CollectionProxy#clearFrancesco Rodriguez2012-05-221-24/+2
| |
* | update CollectionProxy#clear documentationFrancesco Rodriguez2012-05-211-3/+2
| |
* | update CollectionProxy#delete_all documentationFrancesco Rodriguez2012-05-211-2/+29
| |
* | add CollectionProxy#delete_all documentationFrancesco Rodriguez2012-05-211-0/+65
| |
* | Fix AR preloader exampleAlexey Vakhov2012-05-221-1/+1
| |
* | fix CollectionProxy documentation markupFrancesco Rodriguez2012-05-211-8/+8
| |
* | add CollectionProxy#reload documentationFrancesco Rodriguez2012-05-211-0/+18
| |
* | improve CollectionProxy#destroy documentationFrancesco Rodriguez2012-05-211-5/+37
| |
* | add CollectionProxy#destroy documentationFrancesco Rodriguez2012-05-211-1/+42
| |
* | update CollectionProxy#destroy_all documentationFrancesco Rodriguez2012-05-201-1/+9
| |
* | Remove blank trailing commentsHenrik Hodne2012-05-201-1/+0
| | | | | | | | | | | | | | For future reference, this is the regex I used: ^\s*#\s*\n(?!\s*#). Replace with the first match, and voilà! Note that the regex matches a little bit too much, so you probably want to `git add -i .` and go through every single diff to check if it actually should be changed.
* | add CollectionProxy#select documentationFrancesco Rodriguez2012-05-191-2/+55
| |
* | add CollectionProxy#find documentationFrancesco Rodriguez2012-05-191-0/+20
|/
* 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
| |