From: Ward Vandewege <ward@curii.com>
Date: Mon, 7 Mar 2022 20:11:12 +0000 (-0500)
Subject: 18838: Merge branch 'main' into 18838-bump-nokogiri
X-Git-Tag: 2.4.0~62^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/ec3d70f727cf622db949b72d85cdb36504b07f13?hp=0e2f3e506566b1ceb54bd764d3f32c004e45f8b3

18838: Merge branch 'main' into 18838-bump-nokogiri

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>
---

diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index b82568e7d2..7042f39cd3 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -163,7 +163,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0331)
     mini_mime (1.1.0)
-    mini_portile2 (2.6.1)
+    mini_portile2 (2.8.0)
     minitest (5.10.3)
     mocha (1.8.0)
       metaclass (~> 0.0.1)
@@ -179,8 +179,8 @@ GEM
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
     nio4r (2.5.7)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     npm-rails (0.2.1)
       rails (>= 3.2)
diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index 74f26e4d15..5353d559ab 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -140,7 +140,7 @@ GEM
     metaclass (0.0.4)
     method_source (1.0.0)
     mini_mime (1.1.0)
-    mini_portile2 (2.6.1)
+    mini_portile2 (2.8.0)
     minitest (5.10.3)
     mocha (1.8.0)
       metaclass (~> 0.0.1)
@@ -154,8 +154,8 @@ GEM
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
     nio4r (2.5.7)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     oj (3.9.2)
     optimist (3.0.0)