Automatic merge of gitlab-org/gitlab-ce master

0c808a32 · GitLab Bot · 3e3b19b7 · a85fd76f · 0c808a32
Commit 0c808a32 authored Mar 28, 2019 by GitLab Bot
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

lib/gitlab/diff/file.rb lib/gitlab/diff/file.rb +6 -2

No files found.
--- a/lib/gitlab/diff/file.rb
+++ b/lib/gitlab/diff/file.rb
@@ -133,11 +133,15 @@ module Gitlab
      end
      def new_blob
-        new_blob_lazy&.itself
+        strong_memoize(:new_blob) do
+          new_blob_lazy&.itself
+        end
      end
      def old_blob
-        old_blob_lazy&.itself
+        strong_memoize(:old_blob) do
+          old_blob_lazy&.itself
+        end
      end
      def new_blob_lines_between(from_line, to_line)