From: Tom Hughes <tom@compton.nu>
Date: Fri, 13 Nov 2020 09:49:30 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2958' into master
X-Git-Tag: live~2821
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/fa2177710b748e28ab57ffbb48a88e7327e841da?hp=3fdf5942f46e4909d4efbf6fd8f7bf9f8d1c8912

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

diff --git a/Gemfile.lock b/Gemfile.lock
index aeac9879a..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)