Add latest changes from gitlab-org/gitlab@master

1 files changed, 21 insertions, 4 deletions

diff --git a/vendor/gems/bundler-checksum/lib/bundler/checksum/command/init.rb b/vendor/gems/bundler-checksum/lib/bundler/checksum/command/init.rb
index fed0e11080f..47a9b676f1d 100644
--- a/vendor/gems/bundler-checksum/lib/bundler/checksum/command/init.rb
+++ b/vendor/gems/bundler-checksum/lib/bundler/checksum/command/init.rb
@@ -16,14 +16,22 @@ module Bundler::Checksum::Command
         .send(:compact_index_client)
         .instance_variable_get(:@cache)
 
-      seen = []
       Bundler.definition.resolve.sort_by(&:name).each do |spec|
         next unless spec.source.is_a?(Bundler::Source::Rubygems)
+        spec_identifier = "#{spec.name}==#{spec.version}"
 
-        next if seen.include?(spec.name)
-        seen << spec.name
+        previous_checksum = previous_checksums.select do |checksum|
+          checksum[:name] == spec.name && checksum[:version] == spec.version.to_s
+        end
+
+        if !previous_checksum.empty?
+          $stderr.puts "Using #{spec_identifier}"
+          checksums += previous_checksum
+
+          next
+        end
 
-        $stderr.puts "Adding #{spec.name}==#{spec.version}"
+        $stderr.puts "Adding #{spec_identifier}"
 
         compact_index_dependencies = compact_index_cache.dependencies(spec.name).select { |item| item.first == spec.version.to_s }
 
@@ -54,6 +62,15 @@ module Bundler::Checksum::Command
 
     private
 
+    def previous_checksums
+      @previous_checksums ||=
+        if File.exist?(checksum_file)
+          ::Bundler::Checksum.checksums_from_file
+        else
+          []
+        end
+    end
+
     def checksum_file
       ::Bundler::Checksum.checksum_file
     end