Revert "use gemfile over settings (not tested yet)"v1.7.12

It turns out that we already use Gemfile auth over configured auth,
because the Gemfile URI includes the username and password. That means
that mirrors and configured auth will not be used for any URI with auth
in it.

This reverts commit 88969b5210cbab4226cdcc4245762f8c3ba41f1a.

1 files changed, 1 insertions, 3 deletions

diff --git a/lib/bundler/fetcher.rb b/lib/bundler/fetcher.rb
index 7b92a436c2..cf451d0572 100644
--- a/lib/bundler/fetcher.rb
+++ b/lib/bundler/fetcher.rb
@@ -379,12 +379,10 @@ module Bundler
 
     def add_configured_credentials(uri)
       auth = Bundler.settings[uri.to_s]
-
-      if auth && uri.user.nil?
+      if auth
         uri = uri.dup
         uri.user, uri.password = *auth.split(":", 2)
       end
-
       AnonymizableURI.new(uri)
     end