aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-01-04 13:05:43 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-01-04 13:15:59 -0800
commitb899b7be51271b0a6fddd9d95e1a58d782949565 (patch)
treeff1146eb0f4a010b13d4ec117e37fea13d2c5fec /activemodel
parentf28fc9349b298037da483f57130c6a7f7c9740ca (diff)
downloadrails-b899b7be51271b0a6fddd9d95e1a58d782949565.tar.gz
rails-b899b7be51271b0a6fddd9d95e1a58d782949565.tar.bz2
rails-b899b7be51271b0a6fddd9d95e1a58d782949565.zip
Array.wrap no longer needed
Diffstat (limited to 'activemodel')
-rw-r--r--activemodel/lib/active_model/mass_assignment_security.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/activemodel/lib/active_model/mass_assignment_security.rb b/activemodel/lib/active_model/mass_assignment_security.rb
index 9b12d9d281..13495d6786 100644
--- a/activemodel/lib/active_model/mass_assignment_security.rb
+++ b/activemodel/lib/active_model/mass_assignment_security.rb
@@ -1,6 +1,5 @@
require 'active_support/core_ext/class/attribute'
require 'active_support/core_ext/string/inflections'
-require 'active_support/core_ext/array/wrap'
require 'active_model/mass_assignment_security/permission_set'
require 'active_model/mass_assignment_security/sanitizer'
@@ -116,7 +115,7 @@ module ActiveModel
self._protected_attributes = protected_attributes_configs.dup
- Array.wrap(role).each do |name|
+ Array(role).each do |name|
self._protected_attributes[name] = self.protected_attributes(name) + args
end
@@ -178,7 +177,7 @@ module ActiveModel
self._accessible_attributes = accessible_attributes_configs.dup
- Array.wrap(role).each do |name|
+ Array(role).each do |name|
self._accessible_attributes[name] = self.accessible_attributes(name) + args
end