From b3e685df7b090e0161e3d1ea4791f346a430127f Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Tue, 16 Aug 2022 06:01:36 -0700
Subject: [PATCH] Update diffy to v3.4.2
This fixes a CVE on Windows and some other minor bugs.
Diff: https://my.diffend.io/gems/diffy/3.3.0/3.4.2
Relates to https://gitlab.com/gitlab-org/gitlab/-/issues/370512
Changelog: security
---
Gemfile | 2 +-
Gemfile.lock | 6 +++---
vendor/gems/ipynbdiff/Gemfile.lock | 2 +-
vendor/gems/ipynbdiff/ipynbdiff.gemspec | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Gemfile b/Gemfile
index 5cf417a67ae3..fe78422b2876 100644
--- a/Gemfile
+++ b/Gemfile
@@ -178,7 +178,7 @@ gem 'escape_utils', '~> 1.1'
gem 'icalendar'
# Diffs
-gem 'diffy', '~> 3.3'
+gem 'diffy', '~> 3.4'
gem 'diff_match_patch', '~> 0.1.0'
# Application server
diff --git a/Gemfile.lock b/Gemfile.lock
index f04445e1d571..b58df224e7f3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -14,7 +14,7 @@ PATH
remote: vendor/gems/ipynbdiff
specs:
ipynbdiff (0.4.7)
- diffy (~> 3.3)
+ diffy (~> 3.4)
oj (~> 3.13.16)
PATH
@@ -320,7 +320,7 @@ GEM
rotp (~> 6.0)
diff-lcs (1.5.0)
diff_match_patch (0.1.0)
- diffy (3.3.0)
+ diffy (3.4.2)
discordrb-webhooks (3.4.2)
rest-client (>= 2.0.0)
docile (1.4.0)
@@ -1539,7 +1539,7 @@ DEPENDENCIES
devise-pbkdf2-encryptable (~> 0.0.0)!
devise-two-factor (~> 4.0.2)
diff_match_patch (~> 0.1.0)
- diffy (~> 3.3)
+ diffy (~> 3.4)
discordrb-webhooks (~> 3.4)
doorkeeper (~> 5.5.0.rc2)
doorkeeper-openid_connect (~> 1.7.5)
diff --git a/vendor/gems/ipynbdiff/Gemfile.lock b/vendor/gems/ipynbdiff/Gemfile.lock
index 1c2fd81e3b4b..6a8d37506025 100644
--- a/vendor/gems/ipynbdiff/Gemfile.lock
+++ b/vendor/gems/ipynbdiff/Gemfile.lock
@@ -2,7 +2,7 @@ PATH
remote: .
specs:
ipynbdiff (0.4.7)
- diffy (~> 3.3)
+ diffy (~> 3.4)
oj (~> 3.13.16)
GEM
diff --git a/vendor/gems/ipynbdiff/ipynbdiff.gemspec b/vendor/gems/ipynbdiff/ipynbdiff.gemspec
index 3054118ea47b..014005029eff 100644
--- a/vendor/gems/ipynbdiff/ipynbdiff.gemspec
+++ b/vendor/gems/ipynbdiff/ipynbdiff.gemspec
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
s.require_paths = ['lib']
- s.add_runtime_dependency 'diffy', '~> 3.3'
+ s.add_runtime_dependency 'diffy', '~> 3.4'
s.add_runtime_dependency 'oj', '~> 3.13.16'
s.add_development_dependency 'bundler', '~> 2.2'
--
GitLab