Merge branch '9703-auth-proxy'

* 9703-auth-proxy:
  go fmt fixes
  configure proxy environments for Transport property
This commit is contained in:
bergquist
2018-05-28 20:49:40 +02:00

View File

@@ -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,
},