aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/base.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2016-08-10 09:57:07 -0700
committerGitHub <noreply@github.com>2016-08-10 09:57:07 -0700
commit79e27b909ea983a4bec6d246ad23e77c5a2e47f4 (patch)
tree23160166668ec587f049ad9cb2a4c35f331e9e89 /actionpack/lib/action_controller/base.rb
parentdfb246118afbc6b59f6517eaed00208aa6c7e4b5 (diff)
parent496d744fa31665de810b404de968ba86ed87c319 (diff)
downloadrails-79e27b909ea983a4bec6d246ad23e77c5a2e47f4.tar.gz
rails-79e27b909ea983a4bec6d246ad23e77c5a2e47f4.tar.bz2
rails-79e27b909ea983a4bec6d246ad23e77c5a2e47f4.zip
Merge pull request #26092 from kerrizor/kerrizor/force-param-encoding
Allow specifying encoding of parameters by action
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
-rw-r--r--actionpack/lib/action_controller/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 2c7a223971..68a526eccb 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -217,7 +217,7 @@ module ActionController
MimeResponds,
ImplicitRender,
StrongParameters,
-
+ ParameterEncoding,
Cookies,
Flash,
FormBuilder,