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~1772
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/aeb9c4df971e57c6470281990429965728ea76a8?hp=-c

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

aeb9c4df971e57c6470281990429965728ea76a8
diff --combined Gemfile.lock
index ee1b533ab,139038378..d5924e95b
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -71,10 -71,10 +71,10 @@@ GE
        activerecord (>= 3.2, < 7.0)
        rake (>= 10.4, < 14.0)
      ast (2.4.1)
 -    autoprefixer-rails (10.0.3.0)
 +    autoprefixer-rails (10.1.0.0)
        execjs
      aws-eventstream (1.1.0)
 -    aws-partitions (1.402.0)
 +    aws-partitions (1.405.0)
      aws-sdk-core (3.110.0)
        aws-eventstream (~> 1, >= 1.0.2)
        aws-partitions (~> 1, >= 1.239.0)
@@@ -134,24 -134,18 +134,18 @@@
      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)
      debug_inspector (0.0.3)
      deep_merge (1.2.1)
 -    delayed_job (4.1.8)
 -      activesupport (>= 3.0, < 6.1)
 -    delayed_job_active_record (4.1.4)
 -      activerecord (>= 3.0, < 6.1)
 +    delayed_job (4.1.9)
 +      activesupport (>= 3.0, < 6.2)
 +    delayed_job_active_record (4.1.5)
 +      activerecord (>= 3.0, < 6.2)
        delayed_job (>= 3.0, < 5)
      docile (1.3.2)
      dry-configurable (0.11.6)
@@@ -406,10 -400,10 +400,10 @@@
      rubocop-performance (1.9.1)
        rubocop (>= 0.90.0, < 2.0)
        rubocop-ast (>= 0.4.0)
 -    rubocop-rails (2.8.1)
 +    rubocop-rails (2.9.0)
        activesupport (>= 4.2.0)
        rack (>= 1.1)
 -      rubocop (>= 0.87.0)
 +      rubocop (>= 0.90.0, < 2.0)
      ruby-openid (2.9.2)
      ruby-progressbar (1.10.1)
      ruby2_keywords (0.0.2)
@@@ -435,6 -429,7 +429,7 @@@
        json (>= 1.8, < 3)
        simplecov-html (~> 0.10.0)
      simplecov-html (0.10.2)
+     simplecov-lcov (0.8.0)
      smart_properties (1.15.0)
      sprockets (4.0.2)
        concurrent-ruby (~> 1.0)
@@@ -445,14 -440,9 +440,9 @@@
        sprockets (>= 3.0.0)
      strong_migrations (0.7.3)
        activerecord (>= 5)
-     sync (0.5.0)
-     term-ansicolor (1.7.1)
-       tins (~> 1.0)
      thor (1.0.1)
      thread_safe (0.3.6)
      tilt (2.0.10)
-     tins (1.26.0)
-       sync
      tzinfo (1.2.8)
        thread_safe (~> 0.1)
      uglifier (4.2.0)
@@@ -498,7 -488,6 +488,6 @@@ DEPENDENCIE
    capybara (>= 2.15)
    composite_primary_keys (~> 12.0.0)
    config
-   coveralls
    dalli
    delayed_job_active_record
    dynamic_form
@@@ -552,6 -541,8 +541,8 @@@
    sassc-rails
    secure_headers
    selenium-webdriver
+   simplecov
+   simplecov-lcov
    strong_migrations
    uglifier (>= 1.3.0)
    validates_email_format_of (>= 1.5.1)