diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-08-16 02:44:10 +0930 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-16 02:44:10 +0930 |
| commit | 72c1122a1780d149ac441fbe773aca2110bc39e7 (patch) | |
| tree | b1bb51205ae339e71571e18e459be089f708ccf4 /actionpack/lib | |
| parent | 22996ca6ab62c844d16aeecb35d58a5d76c6697e (diff) | |
| parent | 14902560e4c22b8e4ff2e45493d3e2691da524f6 (diff) | |
| download | rails-72c1122a1780d149ac441fbe773aca2110bc39e7.tar.gz rails-72c1122a1780d149ac441fbe773aca2110bc39e7.tar.bz2 rails-72c1122a1780d149ac441fbe773aca2110bc39e7.zip | |
Merge pull request #26160 from prathamesh-sonpatki/use-encoding-from-metal
AC::Metal is already defining default encoding as UTF 8, let's reuse it.
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/metal/parameter_encoding.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/parameter_encoding.rb b/actionpack/lib/action_controller/metal/parameter_encoding.rb index a278c5d011..c457fd0d06 100644 --- a/actionpack/lib/action_controller/metal/parameter_encoding.rb +++ b/actionpack/lib/action_controller/metal/parameter_encoding.rb @@ -17,7 +17,7 @@ module ActionController if @_parameter_encodings[action.to_s] && @_parameter_encodings[action.to_s][param.to_s] @_parameter_encodings[action.to_s][param.to_s] else - ::Encoding::UTF_8 + super end end |