Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 0 deletions

diff --git a/lib/gitlab/diff/rendered/notebook/diff_file.rb b/lib/gitlab/diff/rendered/notebook/diff_file.rb
index 963027803c2..e8b4523d40e 100644
--- a/lib/gitlab/diff/rendered/notebook/diff_file.rb
+++ b/lib/gitlab/diff/rendered/notebook/diff_file.rb
@@ -13,6 +13,7 @@ module Gitlab
           LOG_IPYNBDIFF_GENERATED = 'IPYNB_DIFF_GENERATED'
           LOG_IPYNBDIFF_TIMEOUT = 'IPYNB_DIFF_TIMEOUT'
           LOG_IPYNBDIFF_INVALID = 'IPYNB_DIFF_INVALID'
+          LOG_IPYNBDIFF_TRUNCATED = 'IPYNB_DIFF_TRUNCATED'
 
           attr_reader :source_diff
 
@@ -60,6 +61,11 @@ module Gitlab
 
           def notebook_diff
             strong_memoize(:notebook_diff) do
+              if source_diff.old_blob&.truncated? || source_diff.new_blob&.truncated?
+                log_event(LOG_IPYNBDIFF_TRUNCATED)
+                next
+              end
+
               Timeout.timeout(timeout_time) do
                 IpynbDiff.diff(source_diff.old_blob&.data, source_diff.new_blob&.data,
                                raise_if_invalid_nb: true, diffy_opts: { include_diff_info: true })&.tap do