From: Tom Hughes <tom@compton.nu>
Date: Wed, 16 Sep 2020 07:24:49 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2832'
X-Git-Tag: live~2033
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/17096f9e9e08ebbc4439efe6eff6328473cbc290?hp=7a852e502deae486d744206b6ac15aafdb46d9e4

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

diff --git a/Gemfile.lock b/Gemfile.lock
index 789199ca9..ceadafa8d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -74,16 +74,16 @@ GEM
     autoprefixer-rails (10.0.0)
       execjs
     aws-eventstream (1.1.0)
-    aws-partitions (1.367.0)
-    aws-sdk-core (3.105.0)
+    aws-partitions (1.370.0)
+    aws-sdk-core (3.107.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.37.0)
+    aws-sdk-kms (1.38.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.80.0)
+    aws-sdk-s3 (1.81.0)
       aws-sdk-core (~> 3, >= 3.104.3)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
@@ -399,13 +399,13 @@ GEM
       rubocop-ast (>= 0.3.0, < 1.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.3.0)
+    rubocop-ast (0.4.0)
       parser (>= 2.7.1.4)
     rubocop-minitest (0.10.1)
       rubocop (>= 0.87)
     rubocop-performance (1.8.0)
       rubocop (>= 0.87.0)
-    rubocop-rails (2.8.0)
+    rubocop-rails (2.8.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 0.87.0)