From: Tom Hughes <tom@compton.nu>
Date: Fri, 18 Sep 2020 07:31:33 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2844'
X-Git-Tag: live~2907
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/c6730eee4465c91d3b818618048c14071c50fd8c?ds=sidebyside;hp=-c

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

c6730eee4465c91d3b818618048c14071c50fd8c
diff --combined Gemfile.lock
index 6e8a1b78f,ffe824163..e28a21f8a
--- 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.0)
 +    autoprefixer-rails (10.0.0.2)
        execjs
      aws-eventstream (1.1.0)
      aws-partitions (1.370.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.0)
+     better_errors (2.8.1)
        coderay (>= 1.0.0)
        erubi (>= 1.0.0)
        rack (>= 0.9.0)