From: Tom Hughes Date: Thu, 1 Oct 2020 07:57:41 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/2868' X-Git-Tag: live~2886 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/1affed4b2d93f4259509a5bb674f7c0b00b850f9?ds=sidebyside;hp=-c Merge remote-tracking branch 'upstream/pull/2868' --- 1affed4b2d93f4259509a5bb674f7c0b00b850f9 diff --combined Gemfile.lock index b6a2886c1,eb76ffc30..79ebb3f7f --- a/Gemfile.lock +++ b/Gemfile.lock @@@ -74,17 -74,17 +74,17 @@@ GE autoprefixer-rails (10.0.1.0) execjs aws-eventstream (1.1.0) - aws-partitions (1.376.0) - aws-sdk-core (3.108.0) + aws-partitions (1.378.0) + aws-sdk-core (3.109.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.38.0) - aws-sdk-core (~> 3, >= 3.99.0) + aws-sdk-kms (1.39.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.81.1) - aws-sdk-core (~> 3, >= 3.104.3) + aws-sdk-s3 (1.82.0) + aws-sdk-core (~> 3, >= 3.109.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.2.2) @@@ -389,7 -389,7 +389,7 @@@ rack (>= 1.4) rexml (3.2.4) rinku (2.0.6) - rotp (6.1.0) + rotp (6.2.0) rubocop (0.92.0) parallel (~> 1.10) parser (>= 2.7.1.5)