aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/middleware/params_parser.rb
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2009-04-23 01:09:27 +0100
committerPratik Naik <pratiknaik@gmail.com>2009-04-23 01:09:27 +0100
commit5a1fe9039b33414b7088813712e03bbe38567cff (patch)
tree10e3a15c06494dd09c0324dca894ddcbb68ce582 /actionpack/lib/action_dispatch/middleware/params_parser.rb
parent3384f073e35c5391deaeb209a62a485a0c4dd7b1 (diff)
parent7f6779c1d5e4ec7f642839caa7e86320720f77c8 (diff)
downloadrails-5a1fe9039b33414b7088813712e03bbe38567cff.tar.gz
rails-5a1fe9039b33414b7088813712e03bbe38567cff.tar.bz2
rails-5a1fe9039b33414b7088813712e03bbe38567cff.zip
Merge commit 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/params_parser.rb')
-rw-r--r--actionpack/lib/action_dispatch/middleware/params_parser.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/params_parser.rb b/actionpack/lib/action_dispatch/middleware/params_parser.rb
index 6df572268c..abaee2829e 100644
--- a/actionpack/lib/action_dispatch/middleware/params_parser.rb
+++ b/actionpack/lib/action_dispatch/middleware/params_parser.rb
@@ -1,3 +1,5 @@
+require 'active_support/json'
+
module ActionDispatch
class ParamsParser
ActionController::Base.param_parsers[Mime::XML] = :xml_simple