diff options
| author | Alessio Caiazza <acaiazza@gitlab.com> | 2018-06-04 13:57:51 +0200 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2018-06-04 13:57:51 +0200 |
| commit | 8ffcaf3b85fdf716ffeacf4e9d4c89b922de50b9 (patch) | |
| tree | 2e6acfa369e3e659ef4c6afb9290ad122a8fea5c /lib/gitlab/ci/trace | |
| parent | 1841da16abe864b3dae19636fee9e9bbe9a01b56 (diff) | |
| parent | 23ae072ba2d601a3639a32f5a29302c430106bb8 (diff) | |
| download | gitlab-ce-8ffcaf3b85fdf716ffeacf4e9d4c89b922de50b9.tar.gz | |
Merge branch 'master' into 11-0-stable-prepare-rc211-0-stable-prepare-rc2
Diffstat (limited to 'lib/gitlab/ci/trace')
| -rw-r--r-- | lib/gitlab/ci/trace/http_io.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ci/trace/http_io.rb b/lib/gitlab/ci/trace/http_io.rb index cff924e27ef..8788af57a67 100644 --- a/lib/gitlab/ci/trace/http_io.rb +++ b/lib/gitlab/ci/trace/http_io.rb @@ -148,7 +148,7 @@ module Gitlab def get_chunk unless in_range? - response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == 'https') do |http| + response = Net::HTTP.start(uri.hostname, uri.port, proxy_from_env: true, use_ssl: uri.scheme == 'https') do |http| http.request(request) end |