From: Tom Hughes <tom@compton.nu>
Date: Wed, 22 Jul 2020 14:02:51 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2723'
X-Git-Tag: live~2998
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/c47ae999428a0135d2febf470a0b1422c8774eb5?hp=-c

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

c47ae999428a0135d2febf470a0b1422c8774eb5
diff --combined Gemfile.lock
index 299d62f62,2828142dc..0843b96a0
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -74,8 -74,8 +74,8 @@@ GE
      autoprefixer-rails (9.8.5)
        execjs
      aws-eventstream (1.1.0)
 -    aws-partitions (1.340.0)
 -    aws-sdk-core (3.103.0)
 +    aws-partitions (1.343.0)
 +    aws-sdk-core (3.104.1)
        aws-eventstream (~> 1, >= 1.0.2)
        aws-partitions (~> 1, >= 1.239.0)
        aws-sigv4 (~> 1.1)
@@@ -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.74.0)
 -      aws-sdk-core (~> 3, >= 3.102.1)
 +    aws-sdk-s3 (1.75.0)
 +      aws-sdk-core (~> 3, >= 3.104.1)
        aws-sdk-kms (~> 1)
        aws-sigv4 (~> 1.1)
      aws-sigv4 (1.2.1)
@@@ -110,6 -110,7 +110,7 @@@
        autoprefixer-rails (>= 9.1.0)
        popper_js (>= 1.14.3, < 2)
        sassc-rails (>= 2.0.0)
+     brakeman (4.8.2)
      browser (4.2.0)
      builder (3.2.4)
      bzip2-ffi (1.0.0)
@@@ -484,6 -485,7 +485,7 @@@ DEPENDENCIE
    binding_of_caller
    bootsnap (>= 1.4.2)
    bootstrap (~> 4.5.0)
+   brakeman
    browser
    bzip2-ffi
    cancancan