diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-26 17:49:59 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-26 17:49:59 +0530 |
| commit | 575e77ba167844c0ef492897240d9568cdc9b5f5 (patch) | |
| tree | f5aa8322a8f2e27af5ff8c132eacc87e2741deef /activemodel/lib/active_model | |
| parent | e8cac28917261d6001ab0dbf2da72ef028b3ab72 (diff) | |
| parent | 06731530ff4f13facdfa60e4db55ea9c081cd055 (diff) | |
| download | rails-575e77ba167844c0ef492897240d9568cdc9b5f5.tar.gz rails-575e77ba167844c0ef492897240d9568cdc9b5f5.tar.bz2 rails-575e77ba167844c0ef492897240d9568cdc9b5f5.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activemodel/lib/active_model')
| -rw-r--r-- | activemodel/lib/active_model/mass_assignment_security.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/mass_assignment_security.rb b/activemodel/lib/active_model/mass_assignment_security.rb index 893fbf92c3..cfce1542b1 100644 --- a/activemodel/lib/active_model/mass_assignment_security.rb +++ b/activemodel/lib/active_model/mass_assignment_security.rb @@ -62,7 +62,7 @@ module ActiveModel # Attributes named in this macro are protected from mass-assignment # whenever attributes are sanitized before assignment. A role for the # attributes is optional, if no role is provided then :default is used. - # A role can be defined by using the :as option. + # A role can be defined by using the :as option with a symbol or an array of symbols as the value. # # Mass-assignment to these attributes will simply be ignored, to assign # to them you can use direct writer methods. This is meant to protect @@ -128,7 +128,7 @@ module ActiveModel # # Like +attr_protected+, a role for the attributes is optional, # if no role is provided then :default is used. A role can be defined by - # using the :as option. + # using the :as option with a symbol or an array of symbols as the value. # # This is the opposite of the +attr_protected+ macro: Mass-assignment # will only set attributes in this list, to assign to the rest of |