From: Tom Hughes <tom@compton.nu>
Date: Tue, 11 Aug 2020 17:23:05 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2767'
X-Git-Tag: live~3572
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/82ecd5559711a3223ec900436e38bea0bc376c1c?ds=sidebyside;hp=-c

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

82ecd5559711a3223ec900436e38bea0bc376c1c
diff --combined Gemfile.lock
index a3b2375f8,fd86c1d93..a3a283dc0
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -74,7 -74,7 +74,7 @@@ GE
      autoprefixer-rails (9.8.6.1)
        execjs
      aws-eventstream (1.1.0)
-     aws-partitions (1.353.0)
+     aws-partitions (1.354.0)
      aws-sdk-core (3.104.3)
        aws-eventstream (~> 1, >= 1.0.2)
        aws-partitions (~> 1, >= 1.239.0)
@@@ -83,8 -83,8 +83,8 @@@
      aws-sdk-kms (1.36.0)
        aws-sdk-core (~> 3, >= 3.99.0)
        aws-sigv4 (~> 1.1)
-     aws-sdk-s3 (1.76.0)
-       aws-sdk-core (~> 3, >= 3.104.1)
+     aws-sdk-s3 (1.77.0)
+       aws-sdk-core (~> 3, >= 3.104.3)
        aws-sdk-kms (~> 1)
        aws-sigv4 (~> 1.1)
      aws-sigv4 (1.2.1)
@@@ -390,13 -390,13 +390,13 @@@
      rexml (3.2.4)
      rinku (2.0.6)
      rotp (6.1.0)
 -    rubocop (0.89.0)
 +    rubocop (0.89.1)
        parallel (~> 1.10)
        parser (>= 2.7.1.1)
        rainbow (>= 2.2.2, < 4.0)
        regexp_parser (>= 1.7)
        rexml
 -      rubocop-ast (>= 0.1.0, < 1.0)
 +      rubocop-ast (>= 0.3.0, < 1.0)
        ruby-progressbar (~> 1.7)
        unicode-display_width (>= 1.4.0, < 2.0)
      rubocop-ast (0.3.0)