Merge tag 'v1.8.5'

Version 1.8.5

Conflicts:
	lib/bundler/templates/newgem/newgem.gemspec.tt
	lib/bundler/version.rb

1 files changed, 3 insertions, 2 deletions

diff --git a/lib/bundler/source_list.rb b/lib/bundler/source_list.rb
index 4329749e5a..49efbf7a8e 100644
--- a/lib/bundler/source_list.rb
+++ b/lib/bundler/source_list.rb
@@ -6,7 +6,7 @@ module Bundler
     def initialize
       @path_sources       = []
       @git_sources        = []
-      @rubygems_aggregate = Source::LocalRubygems.new
+      @rubygems_aggregate = Source::Rubygems.new
       @rubygems_sources   = []
     end
 
@@ -57,7 +57,8 @@ module Bundler
         end
       end
 
-      replacement_rubygems = replacement_sources.detect { |s| s.is_a?(Source::LocalRubygems) }
+      replacement_rubygems =
+        replacement_sources.detect { |s| s.is_a?(Source::Rubygems) }
       @rubygems_aggregate = replacement_rubygems if replacement_rubygems
 
       # Return true if there were changes