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

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

864bde05a859a384f83f77c31825e00f01bef5df
diff --combined Gemfile.lock
index 1ef9c82b5,9e950374e..2eeb85e3b
--- 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)
@@@ -71,7 -71,7 +71,7 @@@
        activerecord (>= 3.2, < 7.0)
        rake (>= 10.4, < 14.0)
      ast (2.4.1)
-     autoprefixer-rails (9.8.6)
+     autoprefixer-rails (9.8.6.1)
        execjs
      aws-eventstream (1.1.0)
      aws-partitions (1.343.0)