aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-05-27 14:24:30 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-05-27 14:24:30 -0700
commit406b1b64649f48bdd724826a05c06fb78f5378ea (patch)
tree717a241f1e09c0fcc18cf0a15fdbc012fbb3ee9a /actionpack
parent4797c4caca52b415bc2233254e2503a8e3752c15 (diff)
downloadrails-406b1b64649f48bdd724826a05c06fb78f5378ea.tar.gz
rails-406b1b64649f48bdd724826a05c06fb78f5378ea.tar.bz2
rails-406b1b64649f48bdd724826a05c06fb78f5378ea.zip
rm reset_parameters because we automatically do it from 9ca4839a
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/http/parameters.rb4
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb2
-rw-r--r--actionpack/test/dispatch/routing_test.rb3
3 files changed, 0 insertions, 9 deletions
diff --git a/actionpack/lib/action_dispatch/http/parameters.rb b/actionpack/lib/action_dispatch/http/parameters.rb
index 5b22cd1fcd..ff555f93a8 100644
--- a/actionpack/lib/action_dispatch/http/parameters.rb
+++ b/actionpack/lib/action_dispatch/http/parameters.rb
@@ -43,10 +43,6 @@ module ActionDispatch
@env[Routing::RouteSet::PARAMETERS_KEY] ||= {}
end
- def reset_parameters #:nodoc:
- @env.delete("action_dispatch.request.parameters")
- end
-
private
# Convert nested Hash to HashWithIndifferentAccess
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index 70c3b18e15..84a08770f5 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -51,8 +51,6 @@ module ActionDispatch
else
@app.call req.env
end
- ensure
- req.reset_parameters
end
private
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 51b5e9cf07..a427113763 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -3389,9 +3389,6 @@ class TestAltApp < ActionDispatch::IntegrationTest
def x_header
@env["HTTP_X_HEADER"] || ""
end
-
- def reset_parameters
- end
end
class XHeader