| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Exclude _destroy parameter in :all_blank check (issue #2937) | Aaron Christy | 2011-10-17 | 1 | -2/+3 |
| | | |||||
| * | no need to sort the values | Aaron Patterson | 2011-07-20 | 1 | -1/+1 |
| | | |||||
| * | assign_nested_attributes_for_collection_association should work with Ruby ↵ | Franck Verrot | 2011-07-20 | 1 | -1/+1 |
| | | | | | | | 1.9 [Closes #2106] Children attributes can be either String's or Symbol's, so let's check if the object responds to to_i. | ||||
| * | Use an instance variable to store the current masss assignment options | Andrew White | 2011-07-04 | 1 | -4/+4 |
| | | |||||
| * | Pass mass-assignment options to nested models - closes #1673. | Andrew White | 2011-06-13 | 1 | -13/+19 |
| | | |||||
| * | Remove dead branch code that appeared back in a merge. | José Valim | 2011-04-10 | 1 | -6/+0 |
| | | |||||
| * | Destroying records via nested attributes works independent of reject_if: | Durran Jordan | 2011-04-05 | 1 | -0/+1 |
| | | | | | | | | | | | - When a :_destroy truthiness is provided in the attributes hash, the record should get destroyed regardless of the result of the proc or method supplied to :reject_if. (If :allow_destroy is true) [#6006 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-18 | 1 | -5/+5 |
| |\ | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association.rb activerecord/lib/active_record/fixtures.rb | ||||
| | * | Split AssociationProxy into an Association class (and subclasses) which ↵ | Jon Leighton | 2011-02-18 | 1 | -5/+5 |
| | | | | | | | | | manages the association, and a CollectionProxy class which is *only* a proxy. Singular associations no longer have a proxy. See CHANGELOG for more. | ||||
| * | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2011-02-15 | 1 | -1/+13 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/examples/performance.rb activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/autosave_association.rb activerecord/lib/active_record/base.rb activerecord/lib/active_record/nested_attributes.rb activerecord/test/cases/relations_test.rb | ||||
| | * | Rename add_record_to_target_with_callbacks to add_to_target | Jon Leighton | 2011-02-14 | 1 | -1/+1 |
| | | | |||||
| | * | ActiveRecord::Relation#primary_key should return a string, just like ↵ | Jon Leighton | 2011-01-03 | 1 | -1/+1 |
| | | | | | | | | | ActiveRecord::Base.primary_key does. | ||||
| | * | Let AssociationCollection#find use #scoped to do its finding. Note that I am ↵ | Jon Leighton | 2011-01-03 | 1 | -1/+1 |
| | | | | | | | | | removing test_polymorphic_has_many_going_through_join_model_with_disabled_include, since this specifies different behaviour for an association than for a regular scope. It seems reasonable to expect scopes and association proxies to behave in roughly the same way rather than having subtle differences. | ||||
| | * | When a has_many association is not :uniq, appending the same record multiple ↵ | Jon Leighton | 2010-12-23 | 1 | -1/+12 |
| | | | | | | | | | times should append it to the @target multiple times [#5964 state:resolved] | ||||
| * | | Merge remote branch 'rails/master' into identity_map | Emilio Tagua | 2010-12-20 | 1 | -13/+13 |
| |\| | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/autosave_association.rb activerecord/lib/active_record/base.rb activerecord/lib/active_record/persistence.rb | ||||
| | * | If a nested_attribute is being marked for destruction and at the same time ↵ | Neeraj Singh | 2010-11-24 | 1 | -5/+2 |
| | | | | | | | | | | | | | | | | | an attr_accessor value is being assigned then the value being assigned is being ignored. This patch is a fix for that issue. [#5939 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| | * | Remove unneeded local var. | Emilio Tagua | 2010-11-24 | 1 | -2/+1 |
| | | | |||||
| | * | Remove uneeded local var definition. | Emilio Tagua | 2010-11-24 | 1 | -2/+1 |
| | | | |||||
| | * | class inheritable attributes is used no more! all internal use of class ↵ | Josh Kalderimis | 2010-11-20 | 1 | -4/+9 |
| | | | | | | | | | | | | | inheritable has been changed to class_attribute. class inheritable attributes has been deprecated. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | | Bring back "Reject attributes even if association is loaded" after rebasing ↵ | Emilio Tagua | 2010-11-19 | 1 | -3/+10 |
| | | | | | | | | | to master. | ||||
| * | | Reeject attributes even if association is loaded | Marcin Raczkowski | 2010-11-19 | 1 | -1/+0 |
| |/ | |||||
| * | present? is better here | Santiago Pastorino | 2010-11-11 | 1 | -1/+1 |
| | | |||||
| * | Use ! instead of not | Santiago Pastorino | 2010-11-11 | 1 | -1/+1 |
| | | |||||
| * | Fixed bug in active_record/nested_attributes where an empty string id caused ↵ | Santiago Pastorino | 2010-11-11 | 1 | -1/+1 |
| | | | | | | | | | an ActiveRecord::RecordNotFound error. Found by [Ben Tillman] [#5638 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | ||||
| * | Revert 0c0b0aa0f223523331afdc157fb3992a121bf497 which introduced a security ↵ | Michael Koziarski | 2010-10-15 | 1 | -9/+8 |
| | | | | | | | | | | | vulnerability. This addresses CVE-2010-3933 Conflicts: activerecord/lib/active_record/nested_attributes.rb | ||||
| * | Fix for nested_attributes with has_many association fails when a single ↵ | Neeraj Singh | 2010-09-27 | 1 | -1/+6 |
| | | | | | | | | | record is being updated. [#5705 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | reject_id option should be respected while using nested_attributes | Neeraj Singh | 2010-09-24 | 1 | -3/+3 |
| | | | | | | | [#5579 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | switch present in favor of empty | Aaron Patterson | 2010-09-22 | 1 | -1/+1 |
| | | |||||
| * | Note about validates_presence_of and nested attributes | Trevor Turk | 2010-08-19 | 1 | -0/+16 |
| | | |||||
| * | Note about using attr_accessible with nested attributes | Trevor Turk | 2010-08-19 | 1 | -0/+12 |
| | | |||||
| * | Deletes trailing whitespaces (over text files only find * -type f -exec sed ↵ | Santiago Pastorino | 2010-08-14 | 1 | -1/+1 |
| | | | | | 's/[ \t]*$//' -i {} \;) | ||||
| * | edit pass to apply API guideline wrt the use of "# =>" in example code | Xavier Noria | 2010-07-30 | 1 | -2/+2 |
| | | |||||
| * | accepts_nested_attributes_for typo | Adam Meehan | 2010-06-29 | 1 | -1/+1 |
| | | |||||
| * | Fixes #2415 by creating a new instance of the Model when saving attributes ↵ | George Montana Harkin | 2010-06-27 | 1 | -8/+11 |
| | | | | | | | to that model and the associated attributes already exist. Tests included. [#2415 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Missing quote and indentation wrong | Malcolm Locke | 2010-06-17 | 1 | -2/+2 |
| | | |||||
| * | Adds title and minor changes. | Rizwan Reza | 2010-06-16 | 1 | -1/+2 |
| | | |||||
| * | Fix a bunch of minor spelling mistakes | Evgeniy Dolzhenko | 2010-06-11 | 1 | -1/+1 |
| | | |||||
| * | Use primary key in conditions, not 'id' [#4395 state:resolved] | Mathieu Arnold | 2010-05-04 | 1 | -1/+1 |
| | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Some require indifferent_access added | Santiago Pastorino | 2010-04-21 | 1 | -0/+1 |
| | | | | | Signed-off-by: Xavier Noria <fxn@ubuntu.(none)> | ||||
| * | Ensure not to load the entire association when bulk updating existing ↵ | Pratik Naik | 2010-04-14 | 1 | -2/+12 |
| | | | | | records using nested attributes | ||||
| * | adds missing requires for Object#blank? and Object#present? | Xavier Noria | 2010-03-28 | 1 | -0/+1 |
| | | |||||
| * | cleaning up a bunch of method already defined warnings [#4209 state:resolved] | Aaron Patterson | 2010-03-17 | 1 | -0/+3 |
| | | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
| * | clean up more warnings, remove unnecessary methods, fix eval line numbers. ↵ | Aaron Patterson | 2010-03-16 | 1 | -2/+2 |
| | | | | | | | [#4193 state:resolved] Signed-off-by: wycats <wycats@gmail.com> | ||||
| * | Merge docrails | Pratik Naik | 2010-01-17 | 1 | -5/+5 |
| | | |||||
| * | Renamed AssociationReflection #collection_association? to #collection?. | Eloy Duran | 2010-01-08 | 1 | -1/+1 |
| | | |||||
| * | Raise a RecordNotFound if an ID in nested attributes is given but doesn't ↵ | Eloy Duran | 2010-01-07 | 1 | -0/+11 |
| | | | | | return a record. [#2415 state:resolved] | ||||
| * | Remove deprecated '_delete' option from NestedAttributes. | Eloy Duran | 2010-01-07 | 1 | -13/+2 |
| | | |||||
| * | Removed unnecessary call to #try and cleaned up a bit more. | Eloy Duran | 2010-01-07 | 1 | -6/+4 |
| | | |||||
| * | Cleanup some code in nested_attributes.rb, autosave_association.rb, and ↵ | Eloy Duran | 2010-01-07 | 1 | -7/+1 |
| | | | | | | | associations.rb with AssociationReflection#collection_association? Also cache the result value. | ||||
| * | Refactored nested attributes a bit around :reject_if => :all_blank. | Eloy Duran | 2010-01-07 | 1 | -5/+4 |
| | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |