From f4a2d33a6795b84a3c7c00de0fb8dbfa6100c037 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <jacob@gitlab.com>
Date: Fri, 23 Dec 2016 13:42:42 +0100
Subject: Monkey-patch StrongParameters for ::UploadedFile

---
 config/initializers/workhorse_multipart.rb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

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
-- 
cgit v1.2.1