diff options
| author | Homu <homu@barosl.com> | 2016-02-16 12:17:51 +0900 |
|---|---|---|
| committer | Homu <homu@barosl.com> | 2016-02-16 12:17:51 +0900 |
| commit | 73e23068114da3cbb110a9a8c1aed4cd03b1a0f8 (patch) | |
| tree | 33ddc50c87b78bb2457e4a2dddf05106db11464b /lib/bundler | |
| parent | 9a20a1e5d80c44f2532228dc3c9a03d244de045b (diff) | |
| parent | f6650645c2b2915ad21d588293c2f8e480c6e187 (diff) | |
| download | bundler-73e23068114da3cbb110a9a8c1aed4cd03b1a0f8.tar.gz | |
Auto merge of #4302 - bundler:seg-no-proxy-support, r=indirect
[Fetcher] Support setting http_proxy to :no_proxy
Closes #4294
Diffstat (limited to 'lib/bundler')
| -rw-r--r-- | lib/bundler/fetcher.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/fetcher.rb b/lib/bundler/fetcher.rb index afbecdd5..b9c4cc78 100644 --- a/lib/bundler/fetcher.rb +++ b/lib/bundler/fetcher.rb @@ -236,7 +236,7 @@ module Bundler con = Net::HTTP::Persistent.new "bundler", :ENV if gem_proxy = Bundler.rubygems.configuration[:http_proxy] - con.proxy = URI.parse(gem_proxy) + con.proxy = URI.parse(gem_proxy) if gem_proxy != :no_proxy end if remote_uri.scheme == "https" |