summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-11-01 18:12:42 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-11-01 18:12:42 +0000
commit024e8b496d114c7c9adfce1736cea3c1eddc5979 (patch)
tree992014993824949b7880a19db4f9ac7e9513a5e4 /Gemfile.lock
parent7b9eeda4329ef633e287ac69f1b0399c0dc7d64a (diff)
downloadgitlab-ce-024e8b496d114c7c9adfce1736cea3c1eddc5979.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index b5ebf4732c5..4cb585a75f5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -640,6 +640,9 @@ GEM
invisible_captcha (1.1.0)
rails (>= 4.2)
ipaddress (0.8.3)
+ ipynbdiff (0.3.6)
+ diffy (= 3.3.0)
+ json (= 2.5.1)
jaeger-client (1.1.0)
opentracing (~> 0.3)
thrift
@@ -1501,6 +1504,7 @@ DEPENDENCIES
icalendar
invisible_captcha (~> 1.1.0)
ipaddress (~> 0.8.3)
+ ipynbdiff (= 0.3.6)
jira-ruby (~> 2.1.4)
js_regex (~> 3.7)
json (~> 2.5.1)