diff options
| author | Alessio Caiazza <acaiazza@gitlab.com> | 2019-02-19 14:22:36 +0300 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2019-02-19 14:22:36 +0300 |
| commit | d013510e6c6028c6a3bb0bfe9adc6e2a88050ff8 (patch) | |
| tree | 1b5d38b338345f63bff5905ed1f30b38743c3a1a | |
| parent | c020ccd26bb481893da5681442cab0e36beb6bb5 (diff) | |
| parent | c6a821e896b0372013ffafe09c2e76d36b4447fc (diff) | |
Merge branch '200-fix-proxy' into 'master'
Use proxy from environment for http requests
Closes #200
See merge request gitlab-org/gitlab-pages!131
| -rw-r--r-- | internal/httptransport/transport.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/internal/httptransport/transport.go b/internal/httptransport/transport.go index 207531f4..6d946ae0 100644 --- a/internal/httptransport/transport.go +++ b/internal/httptransport/transport.go @@ -21,6 +21,7 @@ var ( DialTLS: func(network, addr string) (net.Conn, error) { return tls.Dial(network, addr, &tls.Config{RootCAs: pool()}) }, + Proxy: http.ProxyFromEnvironment, } ) |