Merge remote-tracking branch 'upstream/pull/2970' into master

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 3b489344aea2e0acf0009cead8120be11cac4523..8b99e6628b0108274abb5141406bf57116fa122d 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -74,8 +74,8 @@ GEM
     autoprefixer-rails (10.0.2.0)
       execjs
     aws-eventstream (1.1.0)
     autoprefixer-rails (10.0.2.0)
       execjs
     aws-eventstream (1.1.0)

-    aws-partitions (1.390.0)
-    aws-sdk-core (3.109.2)
+    aws-partitions (1.397.0)
+    aws-sdk-core (3.109.3)

       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)


@@ -83,7 +83,7 @@ GEM
     aws-sdk-kms (1.39.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-kms (1.39.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)

-    aws-sdk-s3 (1.84.1)
+    aws-sdk-s3 (1.85.0)

       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)


@@ -254,7 +254,7 @@ GEM
     kramdown (2.3.0)
       rexml
     libxml-ruby (3.2.1)
     kramdown (2.3.0)
       rexml
     libxml-ruby (3.2.1)

-    listen (3.3.0)
+    listen (3.3.1)

       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logstash-event (1.2.02)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logstash-event (1.2.02)


@@ -325,7 +325,7 @@ GEM
       multi_json (~> 1.12)
       omniauth-oauth2 (~> 1.4)
     openstreetmap-deadlock_retry (1.3.0)
       multi_json (~> 1.12)
       omniauth-oauth2 (~> 1.4)
     openstreetmap-deadlock_retry (1.3.0)

-    parallel (1.19.2)
+    parallel (1.20.0)

     parser (2.7.2.0)
       ast (~> 2.4.1)
     pg (1.2.3)
     parser (2.7.2.0)
       ast (~> 2.4.1)
     pg (1.2.3)


@@ -399,12 +399,12 @@ GEM
       rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
       rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)

-    rubocop-ast (0.8.0)
+    rubocop-ast (1.1.1)

       parser (>= 2.7.1.5)
     rubocop-minitest (0.10.1)
       rubocop (>= 0.87)
       parser (>= 2.7.1.5)
     rubocop-minitest (0.10.1)
       rubocop (>= 0.87)

-    rubocop-performance (1.8.1)
-      rubocop (>= 0.87.0)
+    rubocop-performance (1.9.0)
+      rubocop (>= 0.90.0, < 2.0)

       rubocop-ast (>= 0.4.0)
     rubocop-rails (2.8.1)
       activesupport (>= 4.2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rails (2.8.1)
       activesupport (>= 4.2.0)


@@ -443,7 +443,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)

-    strong_migrations (0.7.2)
+    strong_migrations (0.7.3)

       activerecord (>= 5)
     sync (0.5.0)
     term-ansicolor (1.7.1)
       activerecord (>= 5)
     sync (0.5.0)
     term-ansicolor (1.7.1)