Merge pull request #199 from kreeger/use-active-support-on-load

Using ActiveSupport#on_load instead of send :include to boot.
rails · Apr 28, 2014 · 2e741d4 · 2e741d4
2 parents d854a6f + d9311c5
commit 2e741d4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/action_controller/parameters.rb b/lib/action_controller/parameters.rb
@@ -265,4 +265,4 @@ def params=(val)
   end
 end
 
-ActionController::Base.send :include, ActionController::StrongParameters
+ActiveSupport.on_load(:action_controller) { include ActionController::StrongParameters }