From: Tom Hughes <tom@compton.nu>
Date: Thu, 5 Nov 2020 12:40:50 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2935' into master
X-Git-Tag: live~2874
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/c58d2e1996e7203cf04788717f51942328164eb8?ds=sidebyside;hp=-c

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

c58d2e1996e7203cf04788717f51942328164eb8
diff --combined Gemfile.lock
index 8a28aa878,4baeb6243..b47c857d0
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -71,7 -71,7 +71,7 @@@ GE
        activerecord (>= 3.2, < 7.0)
        rake (>= 10.4, < 14.0)
      ast (2.4.1)
-     autoprefixer-rails (10.0.1.2)
+     autoprefixer-rails (10.0.1.3)
        execjs
      aws-eventstream (1.1.0)
      aws-partitions (1.383.0)
@@@ -89,7 -89,7 +89,7 @@@
        aws-sigv4 (~> 1.1)
      aws-sigv4 (1.2.2)
        aws-eventstream (~> 1, >= 1.0.2)
 -    better_errors (2.8.3)
 +    better_errors (2.9.0)
        coderay (>= 1.0.0)
        erubi (>= 1.0.0)
        rack (>= 0.9.0)