Commit 91e56012 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'monkey-patch-comment' into 'master'

Explain why we have this monkey-patch

See merge request !8329
parents b1cd9add e55494d3
...@@ -2,6 +2,12 @@ Rails.application.configure do |config| ...@@ -2,6 +2,12 @@ Rails.application.configure do |config|
config.middleware.use(Gitlab::Middleware::Multipart) config.middleware.use(Gitlab::Middleware::Multipart)
end end
# The Gitlab::Middleware::Multipart middleware inserts instances of our
# own ::UploadedFile class in the Rack env of requests. These instances
# will be blocked by the 'strong parameters' feature of ActionController
# unless we somehow whitelist them. At the moment it seems the only way
# to do that is by monkey-patching.
#
module Gitlab module Gitlab
module StrongParameterScalars module StrongParameterScalars
GITLAB_PERMITTED_SCALAR_TYPES = [::UploadedFile] GITLAB_PERMITTED_SCALAR_TYPES = [::UploadedFile]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment