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

diff --combined Gemfile.lock
index 7dd7d540248eabcfdf2990fca1780e94f5472da0,26c9fe9d41d776e99968176ade4cfe720a75deff..9f3dceff240661835827f969b6296d3a57da2cd8
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -74,8 -74,8 +74,8 @@@ GE
      autoprefixer-rails (10.0.0.2)
        execjs
      aws-eventstream (1.1.0)
 -    aws-partitions (1.370.0)
 -    aws-sdk-core (3.107.0)
 +    aws-partitions (1.376.0)
 +    aws-sdk-core (3.108.0)
        aws-eventstream (~> 1, >= 1.0.2)
        aws-partitions (~> 1, >= 1.239.0)
        aws-sigv4 (~> 1.1)
@@@ -83,7 -83,7 +83,7 @@@
      aws-sdk-kms (1.38.0)
        aws-sdk-core (~> 3, >= 3.99.0)
        aws-sigv4 (~> 1.1)
 -    aws-sdk-s3 (1.81.0)
 +    aws-sdk-s3 (1.81.1)
        aws-sdk-core (~> 3, >= 3.104.3)
        aws-sdk-kms (~> 1)
        aws-sigv4 (~> 1.1)
@@@ -146,7 -146,7 +146,7 @@@
      crack (0.4.3)
        safe_yaml (~> 1.0.0)
      crass (1.0.6)
 -    dalli (2.7.10)
 +    dalli (2.7.11)
      debug_inspector (0.0.3)
      deep_merge (1.2.1)
      delayed_job (4.1.8)
@@@ -326,7 -326,7 +326,7 @@@
        omniauth-oauth2 (~> 1.4)
      openstreetmap-deadlock_retry (1.3.0)
      parallel (1.19.2)
-     parser (2.7.1.4)
+     parser (2.7.1.5)
        ast (~> 2.4.1)
      pg (1.2.3)
      popper_js (1.16.0)
@@@ -390,17 -390,18 +390,18 @@@
      rexml (3.2.4)
      rinku (2.0.6)
      rotp (6.1.0)
-     rubocop (0.91.1)
+     rubocop (0.92.0)
        parallel (~> 1.10)
-       parser (>= 2.7.1.1)
+       parser (>= 2.7.1.5)
        rainbow (>= 2.2.2, < 4.0)
        regexp_parser (>= 1.7)
        rexml
-       rubocop-ast (>= 0.4.0, < 1.0)
+       rubocop-ast (>= 0.5.0)
        ruby-progressbar (~> 1.7)
        unicode-display_width (>= 1.4.0, < 2.0)
-     rubocop-ast (0.4.2)
-       parser (>= 2.7.1.4)
+     rubocop-ast (0.7.0)
+       parser (>= 2.7.1.5)
+       strscan (>= 1.0.0)
      rubocop-minitest (0.10.1)
        rubocop (>= 0.87)
      rubocop-performance (1.8.1)
@@@ -445,6 -446,7 +446,7 @@@
        sprockets (>= 3.0.0)
      strong_migrations (0.7.1)
        activerecord (>= 5)
+     strscan (1.0.3)
      sync (0.5.0)
      term-ansicolor (1.7.1)
        tins (~> 1.0)