Commit 52388feb authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'fix-http-proxy' into 'master'

Make http_io honor HTTP(S)_PROXY environment.

Closes #46968 and #46982

See merge request gitlab-org/gitlab-ce!19282
parents c3450ab9 dca702a5
---
title: Fixed HTTP_PROXY environment not honored when reading remote traces.
merge_request: 19282
author: NLR
type: fixed
...@@ -148,7 +148,7 @@ module Gitlab ...@@ -148,7 +148,7 @@ module Gitlab
def get_chunk def get_chunk
unless in_range? 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) http.request(request)
end end
......
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