From: Tom Hughes <tom@compton.nu>
Date: Mon, 3 Aug 2020 07:44:49 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2749'
X-Git-Tag: live~3045
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/599f99a36fa0c6f7383ee6e7bf573c9b7e215f38?ds=inline;hp=-c

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

599f99a36fa0c6f7383ee6e7bf573c9b7e215f38
diff --combined Gemfile.lock
index 52ff71f39,2bcd67c3d..1ef9c82b5
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -2,7 -2,7 +2,7 @@@ GE
    remote: https://rubygems.org/
    specs:
      SystemTimer (1.2.3)
 -    aasm (5.0.8)
 +    aasm (5.1.0)
        concurrent-ruby (~> 1.0)
      actioncable (6.0.3.2)
        actionpack (= 6.0.3.2)
@@@ -52,7 -52,7 +52,7 @@@
      activerecord (6.0.3.2)
        activemodel (= 6.0.3.2)
        activesupport (= 6.0.3.2)
-     activerecord-import (1.0.5)
+     activerecord-import (1.0.6)
        activerecord (>= 3.2)
      activestorage (6.0.3.2)
        actionpack (= 6.0.3.2)