diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:22:29 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:22:29 +0000 |
| commit | 61d81025139e2e6b3706c05eee4e60ff13417323 (patch) | |
| tree | 517dc8ebc4a9f8d74fd77eb7bd6d5466d5184d94 /app/uploaders | |
| parent | 25fc1060affe576fd7c2f8aad586c5109c51cf7e (diff) | |
| download | gitlab-ce-61d81025139e2e6b3706c05eee4e60ff13417323.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-0-stable-ee
Diffstat (limited to 'app/uploaders')
| -rw-r--r-- | app/uploaders/object_storage.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/uploaders/object_storage.rb b/app/uploaders/object_storage.rb index be5839b7ec5..1d56cddca63 100644 --- a/app/uploaders/object_storage.rb +++ b/app/uploaders/object_storage.rb @@ -283,8 +283,9 @@ module ObjectStorage if file_storage? IO.copy_stream(path, file) else - streamer = lambda { |chunk, _, _| file.write(chunk) } - Excon.get(url, response_block: streamer) + Faraday.get(url) do |req| + req.options.on_data = proc { |chunk, _| file.write(chunk) } + end end file.seek(0, IO::SEEK_SET) |