From: Tom Hughes <tom@compton.nu>
Date: Fri, 13 Nov 2020 09:52:18 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2955' into master
X-Git-Tag: live~1872
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/63221710a4b9ce4c282aab751b35581908e45852?hp=78b9d92207bb215459ecff466c3efe2fa6466ab3

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 72ad92f5a..3b489344a 100644
--- 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)