Remove MassAssignmentSecurity from ActiveModel

This will be moved out to protected_attributes gem

Author: guilleiguaran

activemodel/lib/active_model.rb

@@ -36,7 +36,6 @@ module ActiveModel
   autoload :EachValidator, 'active_model/validator'
   autoload :ForbiddenAttributesProtection
   autoload :Lint
-  autoload :MassAssignmentSecurity
   autoload :Model
   autoload :Name, 'active_model/naming'
   autoload :Naming

activemodel/lib/active_model/forbidden_attributes_protection.rb

@@ -3,11 +3,11 @@ class ForbiddenAttributes < StandardError
   end
 
   module ForbiddenAttributesProtection
-    def sanitize_for_mass_assignment(new_attributes, options = {})
-      if !new_attributes.respond_to?(:permitted?) || (new_attributes.respond_to?(:permitted?) && new_attributes.permitted?)
-        super
-      else
+    def sanitize_for_mass_assignment(attributes, options = {})
+      if attributes.respond_to?(:permitted?) && !attributes.permitted?
         raise ActiveModel::ForbiddenAttributes
+      else
+        attributes
       end
     end
   end