From: Tom Hughes <tom@compton.nu>
Date: Wed, 16 Dec 2020 19:17:22 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/3002'
X-Git-Tag: live~1793
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/aeb9c4df971e57c6470281990429965728ea76a8

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

aeb9c4df971e57c6470281990429965728ea76a8
diff --cc Gemfile.lock
index ee1b533ab,139038378..d5924e95b
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -134,15 -134,9 +134,9 @@@ GE
      composite_primary_keys (12.0.3)
        activerecord (~> 6.0.0)
      concurrent-ruby (1.1.7)
 -    config (2.2.1)
 +    config (2.2.3)
        deep_merge (~> 1.2, >= 1.2.1)
        dry-validation (~> 1.0, >= 1.0.0)
-     coveralls (0.8.23)
-       json (>= 1.8, < 3)
-       simplecov (~> 0.16.1)
-       term-ansicolor (~> 1.3)
-       thor (>= 0.19.4, < 2.0)
-       tins (~> 1.6)
      crack (0.4.4)
      crass (1.0.6)
      dalli (2.7.11)