Merge branch 'permit-uploadedfile-scalar' into 'master'

Monkey-patch StrongParameters for ::UploadedFile

Closes gitlab-ee#1451

See merge request !8299

1 files changed, 16 insertions, 0 deletions

diff --git a/config/initializers/workhorse_multipart.rb b/config/initializers/workhorse_multipart.rb
index 3e2f25c354a..8de7140e3d4 100644
--- a/config/initializers/workhorse_multipart.rb
+++ b/config/initializers/workhorse_multipart.rb
@@ -1,3 +1,19 @@
 Rails.application.configure do |config|
   config.middleware.use(Gitlab::Middleware::Multipart)
 end
+
+module Gitlab
+  module StrongParameterScalars
+    GITLAB_PERMITTED_SCALAR_TYPES = [::UploadedFile]
+
+    def permitted_scalar?(value)
+      super || GITLAB_PERMITTED_SCALAR_TYPES.any? { |type| value.is_a?(type) }
+    end
+  end
+end
+
+module ActionController
+  class Parameters
+    prepend Gitlab::StrongParameterScalars
+  end
+end