aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@gmail.com>2015-04-06 08:34:20 -0400
committerEileen M. Uchitelle <eileencodes@gmail.com>2015-04-06 08:34:20 -0400
commit6b98fbacf7274f903c894b9c7ddab13089f9cf1d (patch)
tree335e658a29cae6104b2749e0cd3bbbcb5833170e
parentca4417d333292b5d345cc64d3e4bbff1b491e8e3 (diff)
parent0eef12c0b3ca3dbe779f8d1c57ff35a53c05bdaa (diff)
downloadrails-6b98fbacf7274f903c894b9c7ddab13089f9cf1d.tar.gz
rails-6b98fbacf7274f903c894b9c7ddab13089f9cf1d.tar.bz2
rails-6b98fbacf7274f903c894b9c7ddab13089f9cf1d.zip
Merge pull request #19665 from eileencodes/fix-parse_query-method-signature
Fix method signature of `parse_query` to match rack
-rw-r--r--actionpack/lib/action_dispatch/http/request.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 732ee67268..a1f84e5ace 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -340,7 +340,7 @@ module ActionDispatch
end
protected
- def parse_query(qs)
+ def parse_query(*)
Utils.deep_munge(super)
end