diff options
Diffstat (limited to 'lib/gitlab/middleware/multipart.rb')
-rw-r--r-- | lib/gitlab/middleware/multipart.rb | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/lib/gitlab/middleware/multipart.rb b/lib/gitlab/middleware/multipart.rb index 0ee9563c227..cb4213d23a4 100644 --- a/lib/gitlab/middleware/multipart.rb +++ b/lib/gitlab/middleware/multipart.rb @@ -84,12 +84,6 @@ module Gitlab end def open_file(params, key) - allowed_paths = [ - ::FileUploader.root, - Gitlab.config.uploads.storage_path, - File.join(Rails.root, 'public/uploads/tmp') - ] - ::UploadedFile.from_params(params, key, allowed_paths) end @@ -106,6 +100,16 @@ module Gitlab # inside other env keys, here we ensure everything is updated correctly ActionDispatch::Request.new(@request.env).update_param(key, value) end + + private + + def allowed_paths + [ + ::FileUploader.root, + Gitlab.config.uploads.storage_path, + File.join(Rails.root, 'public/uploads/tmp') + ] + end end def initialize(app) @@ -125,3 +129,5 @@ module Gitlab end end end + +::Gitlab::Middleware::Multipart::Handler.prepend_if_ee('EE::Gitlab::Middleware::Multipart::Handler') |