Merge remote-tracking branch 'upstream/pull/2955' into master

diff --git a/Gemfile.lock b/Gemfile.lock
index 72ad92f5adc24a15854c71a411577ef4da7e1e30..3b489344aea2e0acf0009cead8120be11cac4523 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -131,7 +131,7 @@ GEM
       xpath (~> 3.2)
     childprocess (3.0.0)
     coderay (1.1.3)
-    composite_primary_keys (12.0.2)
+    composite_primary_keys (12.0.3)
       activerecord (~> 6.0.0)
     concurrent-ruby (1.1.7)
     config (2.2.1)
@@ -461,7 +461,7 @@ GEM
     validates_email_format_of (1.6.3)
       i18n
     vendorer (0.2.0)
-    webmock (3.9.5)
+    webmock (3.10.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)