diff --git a/Gemfile b/Gemfile index 1dd8fd325fd0b8f03018f67a95ba1f15eccb5ae6..2486104e7af7ed1100b0351c4df929f18e67f611 100644 --- a/Gemfile +++ b/Gemfile @@ -544,4 +544,4 @@ gem 'ipaddress', '~> 0.8.3' gem 'parslet', '~> 1.8' -gem 'ipynbdiff', '0.4.6' +gem 'ipynbdiff', '0.4.7' diff --git a/Gemfile.lock b/Gemfile.lock index 3344feae54b8c8cbcdedbcf8f279a66d1882aacc..87bb6167b65a328b9f80e06f8c0914a8e7192aea 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -665,7 +665,7 @@ GEM invisible_captcha (1.1.0) rails (>= 4.2) ipaddress (0.8.3) - ipynbdiff (0.4.6) + ipynbdiff (0.4.7) diffy (~> 3.3) json (~> 2.5, >= 2.5.1) jaeger-client (1.1.0) @@ -1543,7 +1543,7 @@ DEPENDENCIES icalendar invisible_captcha (~> 1.1.0) ipaddress (~> 0.8.3) - ipynbdiff (= 0.4.6) + ipynbdiff (= 0.4.7) jira-ruby (~> 2.1.4) js_regex (~> 3.7) json (~> 2.5.1) diff --git a/lib/gitlab/diff/rendered/notebook/diff_file.rb b/lib/gitlab/diff/rendered/notebook/diff_file.rb index e8b4523d40e0143935275fbb5f9a0decabb5d039..1f064d8af5063f1df979d06a050d69c8c5d9f55c 100644 --- a/lib/gitlab/diff/rendered/notebook/diff_file.rb +++ b/lib/gitlab/diff/rendered/notebook/diff_file.rb @@ -68,7 +68,9 @@ def notebook_diff 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 + raise_if_invalid_nb: true, + hide_images: true, + diffy_opts: { include_diff_info: true })&.tap do log_event(LOG_IPYNBDIFF_GENERATED) end end diff --git a/spec/lib/gitlab/diff/rendered/notebook/diff_file_spec.rb b/spec/lib/gitlab/diff/rendered/notebook/diff_file_spec.rb index d90c662aec889d4cbcd28ba53ece16bbab2bf4ca..1b74e24bf815cc4966a8cda88b2a1a1f454b2b29 100644 --- a/spec/lib/gitlab/diff/rendered/notebook/diff_file_spec.rb +++ b/spec/lib/gitlab/diff/rendered/notebook/diff_file_spec.rb @@ -141,5 +141,9 @@ expect(nb_file.highlighted_diff_lines[12].old_pos).to eq(18) end end + + it 'computes de first line where the remove would appear' do + expect(nb_file.highlighted_diff_lines.map(&:text).join('')).to include('[Hidden Image Output]') + end end end