Only pass proxy to Faraday if explicitly set

Allows Faraday to fall back to ENV['http_proxy'] Closes #157
octokit · Oct 15, 2012 · 55a18f0 · 55a18f0
1 parent 1426822
commit 55a18f0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/octokit/connection.rb b/lib/octokit/connection.rb
@@ -13,11 +13,12 @@ def connection(authenticate=true, raw=false, version=3, force_urlencoded=false)
       end
 
       options = {
-        :proxy => proxy,
         :ssl => { :verify => false },
         :url => url,
       }
 
+      options[:proxy] = proxy unless proxy.nil?
+
       options.merge!(:params => {:access_token => oauth_token}) if oauthed? && !authenticated?
       options.merge!(:params => unauthed_rate_limit_params) if !oauthed? && !authenticated? && unauthed_rate_limited?