diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-06-23 16:47:56 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-06-23 16:47:56 -0700 |
| commit | 7ca1a3d2aa1398ed3021f00d67e7e3fa86b600b9 (patch) | |
| tree | 40b5dd8ebef1e52460fd27d701c03f66f934bad3 | |
| parent | 4389fc9733835186cf92a72e0dd419ac6caa023c (diff) | |
| parent | e9454979555c0d36e630a2b2de43f2432ca231fa (diff) | |
| download | rails-7ca1a3d2aa1398ed3021f00d67e7e3fa86b600b9.tar.gz rails-7ca1a3d2aa1398ed3021f00d67e7e3fa86b600b9.tar.bz2 rails-7ca1a3d2aa1398ed3021f00d67e7e3fa86b600b9.zip | |
Merge pull request #1840 from wildchild/master
Minor formatting fix
| -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 c04de5b9a4..3f9feb7631 100644 --- a/activemodel/lib/active_model/mass_assignment_security.rb +++ b/activemodel/lib/active_model/mass_assignment_security.rb @@ -111,7 +111,7 @@ module ActiveModel options = args.extract_options! role = options[:as] || :default - self._protected_attributes = protected_attributes_configs.dup + self._protected_attributes = protected_attributes_configs.dup Array.wrap(role).each do |name| self._protected_attributes[name] = self.protected_attributes(name) + args @@ -173,7 +173,7 @@ module ActiveModel options = args.extract_options! role = options[:as] || :default - self._accessible_attributes = accessible_attributes_configs.dup + self._accessible_attributes = accessible_attributes_configs.dup Array.wrap(role).each do |name| self._accessible_attributes[name] = self.accessible_attributes(name) + args |