Commit 5881bed3 authored by Stan Hu's avatar Stan Hu

Merge branch 'ebonet/updating-ipynbdiff' into 'master'

Fixes infinite loop when rendering Ipynb Diffs

See merge request gitlab-org/gitlab!85142
parents 399ae18b a8fdf5f9
...@@ -542,4 +542,4 @@ gem 'ipaddress', '~> 0.8.3' ...@@ -542,4 +542,4 @@ gem 'ipaddress', '~> 0.8.3'
gem 'parslet', '~> 1.8' gem 'parslet', '~> 1.8'
gem 'ipynbdiff', '0.4.4' gem 'ipynbdiff', '0.4.5'
...@@ -655,7 +655,7 @@ GEM ...@@ -655,7 +655,7 @@ GEM
invisible_captcha (1.1.0) invisible_captcha (1.1.0)
rails (>= 4.2) rails (>= 4.2)
ipaddress (0.8.3) ipaddress (0.8.3)
ipynbdiff (0.4.4) ipynbdiff (0.4.5)
diffy (~> 3.3) diffy (~> 3.3)
json (~> 2.5, >= 2.5.1) json (~> 2.5, >= 2.5.1)
jaeger-client (1.1.0) jaeger-client (1.1.0)
...@@ -1536,7 +1536,7 @@ DEPENDENCIES ...@@ -1536,7 +1536,7 @@ DEPENDENCIES
icalendar icalendar
invisible_captcha (~> 1.1.0) invisible_captcha (~> 1.1.0)
ipaddress (~> 0.8.3) ipaddress (~> 0.8.3)
ipynbdiff (= 0.4.4) ipynbdiff (= 0.4.5)
jira-ruby (~> 2.1.4) jira-ruby (~> 2.1.4)
js_regex (~> 3.7) js_regex (~> 3.7)
json (~> 2.5.1) json (~> 2.5.1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment