diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-01-05 15:50:19 +0000 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-01-05 15:50:19 +0000 |
commit | c53ba44c988ba8894050aef3b4552453ecde16b5 (patch) | |
tree | 24c2e284c4b17c52f1950f302fd7d53eae1e32f8 /lib | |
parent | 647271c9fc122b5a9cdc6a1c7bbd876124e6a9fa (diff) | |
parent | 7d28e39f58e53919379eed81b4385c5f335fe37f (diff) | |
download | gitlab-ce-c53ba44c988ba8894050aef3b4552453ecde16b5.tar.gz |
Merge branch 'sh-fix-multipart-uploads-failure' into 'master'
Fix multipart attachments not uploading
Closes gitlab-ee#9035
See merge request gitlab-org/gitlab-ce!24170
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/middleware/multipart.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/middleware/multipart.rb b/lib/gitlab/middleware/multipart.rb index 84c2f0d5720..433151b80e7 100644 --- a/lib/gitlab/middleware/multipart.rb +++ b/lib/gitlab/middleware/multipart.rb @@ -32,7 +32,7 @@ module Gitlab class Handler def initialize(env, message) - @request = Rack::Request.new(env) + @request = ActionDispatch::Request.new(env) @rewritten_fields = message['rewritten_fields'] @open_files = [] end |