From: Tom Hughes <tom@compton.nu>
Date: Fri, 27 Nov 2020 08:53:16 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/2985' into master
X-Git-Tag: live~2825
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/fccf20edb265fb5a38ee7c0db5ff1abcbbb344dc?hp=-c

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

fccf20edb265fb5a38ee7c0db5ff1abcbbb344dc
diff --combined Gemfile.lock
index 3678ab6b2,ef02cf6e5..a7d9fbf28
--- 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.2.0)
+     autoprefixer-rails (10.0.3.0)
        execjs
      aws-eventstream (1.1.0)
      aws-partitions (1.397.0)
@@@ -121,7 -121,7 +121,7 @@@
      cancancan (3.1.0)
      canonical-rails (0.2.9)
        rails (>= 4.1, < 6.1)
 -    capybara (3.33.0)
 +    capybara (3.34.0)
        addressable
        mini_mime (>= 0.1.3)
        nokogiri (~> 1.8)