Merge branch '9703-auth-proxy'

* 9703-auth-proxy:
  go fmt fixes
  configure proxy environments for Transport property

pkg/api/login_oauth.go

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