Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 2 deletions

diff --git a/app/models/commit_collection.rb b/app/models/commit_collection.rb
index 6b303c52283..d4c29aa295b 100644
--- a/app/models/commit_collection.rb
+++ b/app/models/commit_collection.rb
@@ -72,8 +72,15 @@ class CommitCollection
     end.compact]
 
     # Replace the commits, keeping the same order
-    @commits = @commits.map do |c|
-      replacements.fetch(c.id, c)
+    @commits = @commits.map do |original_commit|
+      # Return the original instance: if it didn't need to be batchloaded, it was
+      # already enriched.
+      batch_loaded_commit = replacements.fetch(original_commit.id, original_commit)
+
+      # If batch loading the commit failed, fall back to the original commit.
+      # We need to explicitly check `.nil?` since otherwise a `BatchLoader` instance
+      # that looks like `nil` is returned.
+      batch_loaded_commit.nil? ? original_commit : batch_loaded_commit
     end
 
     self