diff options
| author | eileencodes <eileencodes@gmail.com> | 2015-04-06 07:58:38 -0400 |
|---|---|---|
| committer | eileencodes <eileencodes@gmail.com> | 2015-04-06 08:30:32 -0400 |
| commit | 0eef12c0b3ca3dbe779f8d1c57ff35a53c05bdaa (patch) | |
| tree | bfa77d52d6a8a5a9260dc06b8500d0eaa64c76dc /actionpack/lib | |
| parent | 9040699aed64a725cc66461d63f794abc2f13afc (diff) | |
| download | rails-0eef12c0b3ca3dbe779f8d1c57ff35a53c05bdaa.tar.gz rails-0eef12c0b3ca3dbe779f8d1c57ff35a53c05bdaa.tar.bz2 rails-0eef12c0b3ca3dbe779f8d1c57ff35a53c05bdaa.zip | |
Fix method signature of `parse_query` to match rack
Recently rack was changed to have a second argument on the `parse_query`
method (in rack/rack#781). Rails relies on this and it's `parse_query`
method was complaining about missing the second argument. I changed the
arguments to `*` so we don't have this issue in the future.
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/request.rb | 2 |
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 |