Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Remove unused private method AR::NestedAttributes#unassignable_keys and ↵ | Guillermo Iguaran | 2012-09-19 | 1 | -5/+1 | |
| | | | | reference to mass_assignment options | |||||
* | Remove mass_assignment_options from ActiveRecord | Guillermo Iguaran | 2012-09-16 | 1 | -12/+10 | |
| | ||||||
* | Remove mass assignment security from ActiveRecord | Guillermo Iguaran | 2012-09-16 | 1 | -15/+1 | |
| | ||||||
* | Refactor nested attributes limit logic to lookup :limit option only once | Carlos Antonio da Silva | 2012-09-08 | 1 | -11/+12 | |
| | ||||||
* | allow to pass Symbol or Proc into :limit option of ↵ | Mikhail Dieterle | 2012-08-26 | 1 | -3/+13 | |
| | | | | #accepts_nested_attributes_for | |||||
* | load active_support/core_ext/class/attribute in active_support/rails | Xavier Noria | 2012-08-02 | 1 | -1/+0 | |
| | ||||||
* | load active_support/core_ext/object/blank in active_support/rails | Xavier Noria | 2012-08-02 | 1 | -1/+0 | |
| | ||||||
* | s/scoped/scope/ | Jon Leighton | 2012-08-01 | 1 | -1/+1 | |
| | ||||||
* | Made ArgumentError messages consistent. | Philip Arndt | 2012-07-06 | 1 | -2/+2 | |
| | ||||||
* | Simplify AR configuration code. | Jon Leighton | 2012-06-15 | 1 | -1/+5 | |
| | | | | | Get rid of ActiveModel::Configuration, make better use of ActiveSupport::Concern + class_attribute, etc. | |||||
* | better wording | Hrvoje Šimić | 2012-05-11 | 1 | -4/+4 | |
| | ||||||
* | Nested attribute setters can be overridden. | Jonathan Mukai & Peter Jaros | 2012-03-28 | 1 | -1/+1 | |
| | | | | Overriding implementation can call super. | |||||
* | Modified comments explaining what the update_only option does. | Mark | 2012-02-28 | 1 | -8/+19 | |
| | ||||||
* | Array.wrap is an overhead as there is already check for class | Sergey Nartimov | 2012-01-06 | 1 | -1/+1 | |
| | ||||||
* | Support configuration on ActiveRecord::Model. | Jon Leighton | 2011-12-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | The problem: We need to be able to specify configuration in a way that can be inherited to models that include ActiveRecord::Model. So it is no longer sufficient to put 'top level' config on ActiveRecord::Base, but we do want configuration specified on ActiveRecord::Base and descendants to continue to work. So we need something like class_attribute that can be defined on a module but that is inherited when ActiveRecord::Model is included. The solution: added ActiveModel::Configuration module which provides a config_attribute macro. It's a bit specific hence I am not putting this in Active Support or making it a 'public API' at present. | |||||
* | 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 | |
| |