From: Tom Hughes <tom@compton.nu>
Date: Fri, 16 Oct 2020 07:26:56 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2888'
X-Git-Tag: live~2946
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/705e37f45ae2f1c745ef0aa445ed39a5775b4036?hp=96f426a2eaa6009496b0f51934a497b3c970db97

Merge remote-tracking branch 'upstream/pull/2888'
---

diff --git a/Gemfile.lock b/Gemfile.lock
index 0d3627354..d87fa93ac 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -52,7 +52,7 @@ GEM
     activerecord (6.0.3.4)
       activemodel (= 6.0.3.4)
       activesupport (= 6.0.3.4)
-    activerecord-import (1.0.6)
+    activerecord-import (1.0.7)
       activerecord (>= 3.2)
     activestorage (6.0.3.4)
       actionpack (= 6.0.3.4)