Merge branch '9703-auth-proxy'

* 9703-auth-proxy:
  go fmt fixes
  configure proxy environments for Transport property
pull/12079/merge
bergquist 8 years ago
commit add791b2cc
  1. 1
      pkg/api/login_oauth.go

@ -78,6 +78,7 @@ func OAuthLogin(ctx *m.ReqContext) {
// handle call back
tr := &http.Transport{
Proxy: http.ProxyFromEnvironment,
TLSClientConfig: &tls.Config{
InsecureSkipVerify: setting.OAuthService.OAuthInfos[name].TlsSkipVerify,
},

Loading…
Cancel
Save