aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-05-31 14:52:20 -0700
committerJosé Valim <jose.valim@gmail.com>2011-05-31 14:52:20 -0700
commit87762245e9070a0e7ebe446ea6930fa368bf0e16 (patch)
tree199c833bc2c439a3c6a5c9a3dd53e5d7e8e96cbd
parent4067d88df59aa86743a9e4122ca72efd71c932b2 (diff)
parent70381cf507fcc15ebee20525e305ed5badb7469e (diff)
downloadrails-87762245e9070a0e7ebe446ea6930fa368bf0e16.tar.gz
rails-87762245e9070a0e7ebe446ea6930fa368bf0e16.tar.bz2
rails-87762245e9070a0e7ebe446ea6930fa368bf0e16.zip
Merge pull request #1434 from dmathieu/mass_assignment
Mass assignment
-rw-r--r--activemodel/lib/active_model/mass_assignment_security.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/mass_assignment_security.rb b/activemodel/lib/active_model/mass_assignment_security.rb
index c97420bc03..a7b4706906 100644
--- a/activemodel/lib/active_model/mass_assignment_security.rb
+++ b/activemodel/lib/active_model/mass_assignment_security.rb
@@ -1,4 +1,5 @@
-require 'active_support/core_ext/class/attribute.rb'
+require 'active_support/core_ext/class/attribute'
+require 'active_support/core_ext/string/inflections'
require 'active_model/mass_assignment_security/permission_set'
require 'active_model/mass_assignment_security/sanitizer'