diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-03-22 07:44:25 -0700 |
|---|---|---|
| committer | Guillermo Iguaran <guilleiguaran@gmail.com> | 2013-03-22 07:44:25 -0700 |
| commit | f34c226df50c8c17029dc533b7c96a82565a2519 (patch) | |
| tree | af3cd4ff36e877a146dd59a7900276e3e451102f | |
| parent | c91789c76b8cd403c299e28c98a6b046cc4f0af1 (diff) | |
| parent | 28afe45519230d08c9c350a7d4f5f5382b3687dd (diff) | |
| download | rails-f34c226df50c8c17029dc533b7c96a82565a2519.tar.gz rails-f34c226df50c8c17029dc533b7c96a82565a2519.tar.bz2 rails-f34c226df50c8c17029dc533b7c96a82565a2519.zip | |
Merge pull request #9871 from arunagw/stringio-require-jruby
StringIO is not required by default in JRuby
| -rw-r--r-- | actionpack/lib/action_controller/metal/strong_parameters.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal/strong_parameters.rb b/actionpack/lib/action_controller/metal/strong_parameters.rb index acad8a0799..4ef2639a76 100644 --- a/actionpack/lib/action_controller/metal/strong_parameters.rb +++ b/actionpack/lib/action_controller/metal/strong_parameters.rb @@ -2,6 +2,7 @@ require 'active_support/core_ext/hash/indifferent_access' require 'active_support/core_ext/array/wrap' require 'active_support/rescuable' require 'action_dispatch/http/upload' +require 'stringio' module ActionController # Raised when a required parameter is missing. |