aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/compatibility.rb
diff options
context:
space:
mode:
authorEmilio Tagua <miloops@gmail.com>2009-08-25 19:37:41 -0300
committerEmilio Tagua <miloops@gmail.com>2009-08-25 19:37:41 -0300
commit51910106f196e4461b35661f90a835dec0c21ccf (patch)
tree2233f4f95e6de1cf071f69ffd55c75ed9fae69e8 /actionpack/lib/action_controller/metal/compatibility.rb
parent689b89f548077264e46153222455d931a0d7ddf6 (diff)
parentc3a0a36fc3c5e54ad44643b8c0470ccbd47d9a64 (diff)
downloadrails-51910106f196e4461b35661f90a835dec0c21ccf.tar.gz
rails-51910106f196e4461b35661f90a835dec0c21ccf.tar.bz2
rails-51910106f196e4461b35661f90a835dec0c21ccf.zip
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_controller/metal/compatibility.rb')
-rw-r--r--actionpack/lib/action_controller/metal/compatibility.rb6
1 files changed, 0 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb
index 5b0165f0e7..22f9ab219c 100644
--- a/actionpack/lib/action_controller/metal/compatibility.rb
+++ b/actionpack/lib/action_controller/metal/compatibility.rb
@@ -16,12 +16,6 @@ module ActionController
cattr_accessor :allow_concurrency
self.allow_concurrency = false
- cattr_accessor :param_parsers
- self.param_parsers = { Mime::MULTIPART_FORM => :multipart_form,
- Mime::URL_ENCODED_FORM => :url_encoded_form,
- Mime::XML => :xml_simple,
- Mime::JSON => :json }
-
cattr_accessor :relative_url_root
self.relative_url_root = ENV['RAILS_RELATIVE_URL_ROOT']