Skip to content
Snippets Groups Projects
Commit 9836b8e3 authored by Eduardo Bonet's avatar Eduardo Bonet Committed by Alessio Caiazza
Browse files

Fixes infinite loop when rendering Ipynb Diffs

Merge branch 'security-upgrade-ipynbdiff-0.4.5-14-9-14-9' into '14-9-stable-ee'

See merge request gitlab-org/security/gitlab!2401

Changelog: security
parent 5087c814
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -542,4 +542,4 @@ gem 'ipaddress', '~> 0.8.3'
 
gem 'parslet', '~> 1.8'
 
gem 'ipynbdiff', '0.4.4'
gem 'ipynbdiff', '0.4.5'
Loading
Loading
@@ -654,7 +654,7 @@ GEM
invisible_captcha (1.1.0)
rails (>= 4.2)
ipaddress (0.8.3)
ipynbdiff (0.4.4)
ipynbdiff (0.4.5)
diffy (~> 3.3)
json (~> 2.5, >= 2.5.1)
jaeger-client (1.1.0)
Loading
Loading
@@ -1535,7 +1535,7 @@ DEPENDENCIES
icalendar
invisible_captcha (~> 1.1.0)
ipaddress (~> 0.8.3)
ipynbdiff (= 0.4.4)
ipynbdiff (= 0.4.5)
jira-ruby (~> 2.1.4)
js_regex (~> 3.7)
json (~> 2.5.1)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment