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~2806
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/fa2177710b748e28ab57ffbb48a88e7327e841da?hp=-c

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

fa2177710b748e28ab57ffbb48a88e7327e841da
diff --combined Gemfile.lock
index 9b4f473bb,aeac9879a..3b489344a
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -131,7 -131,7 +131,7 @@@ GE
        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 +461,7 @@@
      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)