From b48b150cc50dbd54a719ea54a965de53d4531170 Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Fri, 12 Feb 2016 09:55:42 -0800 Subject: convert MultilineOperationIndentation style to "indented" this looks nicer. --- lib/chef/http/basic_client.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/chef/http') diff --git a/lib/chef/http/basic_client.rb b/lib/chef/http/basic_client.rb index 9428858cdf..e0a02a05cf 100644 --- a/lib/chef/http/basic_client.rb +++ b/lib/chef/http/basic_client.rb @@ -98,7 +98,7 @@ class Chef #adapted from buildr/lib/buildr/core/transports.rb def proxy_uri proxy = Chef::Config["#{url.scheme}_proxy"] || - env["#{url.scheme.upcase}_PROXY"] || env["#{url.scheme}_proxy"] + env["#{url.scheme.upcase}_PROXY"] || env["#{url.scheme}_proxy"] # Check if the proxy string contains a scheme. If not, add the url's scheme to the # proxy before parsing. The regex /^.*:\/\// matches, for example, http://. Reusing proxy -- cgit v1.2.1