Commit add791b2 by bergquist

Merge branch '9703-auth-proxy'

* 9703-auth-proxy:
  go fmt fixes
  configure proxy environments for Transport property
parents 6d8d6cdb d7b5fb46
......@@ -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,
},
......
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