From: Andy Allan <git@gravitystorm.co.uk>
Date: Thu, 9 Jul 2020 11:24:45 +0000 (+0200)
Subject: Merge pull request #2702 from openstreetmap/dependabot/bundler/aws-sdk-s3-1.74.0
X-Git-Tag: live~2862
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/a8d2117cdebaeb14f91bfd1c95ed82409f2272cb?hp=-c

Merge pull request #2702 from openstreetmap/dependabot/bundler/aws-sdk-s3-1.74.0

Bump aws-sdk-s3 from 1.73.0 to 1.74.0
---

a8d2117cdebaeb14f91bfd1c95ed82409f2272cb
diff --combined Gemfile.lock
index 8ee0e20e2,a2321fd56..3bdfeac16
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -74,7 -74,7 +74,7 @@@ GE
      autoprefixer-rails (9.8.4)
        execjs
      aws-eventstream (1.1.0)
-     aws-partitions (1.338.0)
+     aws-partitions (1.340.0)
      aws-sdk-core (3.103.0)
        aws-eventstream (~> 1, >= 1.0.2)
        aws-partitions (~> 1, >= 1.239.0)
@@@ -83,7 -83,7 +83,7 @@@
      aws-sdk-kms (1.36.0)
        aws-sdk-core (~> 3, >= 3.99.0)
        aws-sigv4 (~> 1.1)
-     aws-sdk-s3 (1.73.0)
+     aws-sdk-s3 (1.74.0)
        aws-sdk-core (~> 3, >= 3.102.1)
        aws-sdk-kms (~> 1)
        aws-sigv4 (~> 1.1)
@@@ -200,10 -200,10 +200,10 @@@
      erubi (1.9.0)
      execjs (2.7.0)
      exifr (1.3.6)
 -    factory_bot (6.0.2)
 +    factory_bot (6.1.0)
        activesupport (>= 5.0.0)
 -    factory_bot_rails (6.0.0)
 -      factory_bot (~> 6.0.0)
 +    factory_bot_rails (6.1.0)
 +      factory_bot (~> 6.1.0)
        railties (>= 5.0.0)
      faraday (1.0.1)
        multipart-post (>= 1.2, < 3)
@@@ -276,7 -276,7 +276,7 @@@
      multi_xml (0.6.0)
      multipart-post (2.1.1)
      nio4r (2.5.2)
 -    nokogiri (1.10.9)
 +    nokogiri (1.10.10)
        mini_portile2 (~> 2.4.0)
      nokogumbo (2.0.2)
        nokogiri (~> 1.8, >= 1.8.4)