lib/geminabox/server.rb in geminabox-1.2.0 vs lib/geminabox/server.rb in geminabox-1.3.0

@@ -310,10 +310,10 @@
     def remote_gem_list
       RubygemsDependency.for(*query_gems)
     end
 
     def combined_gem_list
-      GemListMerge.from(local_gem_list, remote_gem_list)
+      GemListMerge.merge(local_gem_list, remote_gem_list, strategy: Geminabox.rubygems_proxy_merge_strategy)
     end
 
     helpers do
       def href(text)
         if text && (text.start_with?('http://') || text.start_with?('https://'))