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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 6bbfb6b203405e4ba46043d687ed3f27ab3b19f7..8e6d4ab851d30cf91f358f9cd7c7d2ab24c4c4be 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -52,7 +52,7 @@ GEM
     activerecord (6.0.3.1)
       activemodel (= 6.0.3.1)
       activesupport (= 6.0.3.1)
     activerecord (6.0.3.1)
       activemodel (= 6.0.3.1)
       activesupport (= 6.0.3.1)

-    activerecord-import (1.0.4)
+    activerecord-import (1.0.5)

       activerecord (>= 3.2)
     activestorage (6.0.3.1)
       actionpack (= 6.0.3.1)
       activerecord (>= 3.2)
     activestorage (6.0.3.1)
       actionpack (= 6.0.3.1)


@@ -74,8 +74,8 @@ GEM
     autoprefixer-rails (9.7.6)
       execjs
     aws-eventstream (1.1.0)
     autoprefixer-rails (9.7.6)
       execjs
     aws-eventstream (1.1.0)

-    aws-partitions (1.316.0)
-    aws-sdk-core (3.96.0)
+    aws-partitions (1.321.0)
+    aws-sdk-core (3.96.1)

       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,8 +83,8 @@ GEM
     aws-sdk-kms (1.31.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-kms (1.31.0)
       aws-sdk-core (~> 3, >= 3.71.0)
       aws-sigv4 (~> 1.1)

-    aws-sdk-s3 (1.64.0)
-      aws-sdk-core (~> 3, >= 3.83.0)
+    aws-sdk-s3 (1.66.0)
+      aws-sdk-core (~> 3, >= 3.96.1)

       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.1.3)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.1.3)


@@ -93,7 +93,7 @@ GEM
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)

-    better_html (1.0.14)
+    better_html (1.0.15)

       actionview (>= 4.0)
       activesupport (>= 4.0)
       ast (~> 2.0)
       actionview (>= 4.0)
       activesupport (>= 4.0)
       ast (~> 2.0)


@@ -127,7 +127,7 @@ GEM
       xpath (~> 3.2)
     childprocess (3.0.0)
     coderay (1.1.2)
       xpath (~> 3.2)
     childprocess (3.0.0)
     coderay (1.1.2)

-    composite_primary_keys (12.0.1)
+    composite_primary_keys (12.0.2)

       activerecord (~> 6.0.0)
     concurrent-ruby (1.1.6)
     config (2.2.1)
       activerecord (~> 6.0.0)
     concurrent-ruby (1.1.6)
     config (2.2.1)


@@ -167,7 +167,7 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)

-    dry-schema (1.5.0)
+    dry-schema (1.5.1)

       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.8, >= 0.8.3)
       dry-core (~> 0.4)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.8, >= 0.8.3)
       dry-core (~> 0.4)


@@ -190,7 +190,7 @@ GEM
       dry-initializer (~> 3.0)
       dry-schema (~> 1.5)
     dynamic_form (1.1.4)
       dry-initializer (~> 3.0)
       dry-schema (~> 1.5)
     dynamic_form (1.1.4)

-    erb_lint (0.0.32)
+    erb_lint (0.0.33)

       activesupport
       better_html (~> 1.0.7)
       html_tokenizer
       activesupport
       better_html (~> 1.0.7)
       html_tokenizer


@@ -248,7 +248,7 @@ GEM
     kgio (2.11.3)
     kramdown (2.2.1)
       rexml
     kgio (2.11.3)
     kramdown (2.2.1)
       rexml

-    libxml-ruby (3.1.0)
+    libxml-ruby (3.2.0)

     listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)


@@ -321,14 +321,14 @@ GEM
       omniauth-oauth2 (~> 1.4)
     openstreetmap-deadlock_retry (1.3.0)
     parallel (1.19.1)
       omniauth-oauth2 (~> 1.4)
     openstreetmap-deadlock_retry (1.3.0)
     parallel (1.19.1)

-    parser (2.7.1.2)
+    parser (2.7.1.3)

       ast (~> 2.4.0)
     pg (1.2.3)
     popper_js (1.16.0)
     progress (3.5.2)
     psych (3.1.0)
     public_suffix (4.0.5)
       ast (~> 2.4.0)
     pg (1.2.3)
     popper_js (1.16.0)
     progress (3.5.2)
     psych (3.1.0)
     public_suffix (4.0.5)

-    puma (3.12.4)
+    puma (3.12.6)

     quad_tile (1.0.1)
     r2 (0.2.7)
     rack (2.2.2)
     quad_tile (1.0.1)
     r2 (0.2.7)
     rack (2.2.2)


@@ -385,16 +385,19 @@ GEM
     rinku (2.0.6)
     rotp (6.0.0)
       addressable (~> 2.7)
     rinku (2.0.6)
     rotp (6.0.0)
       addressable (~> 2.7)

-    rubocop (0.83.0)
+    rubocop (0.84.0)

       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       rexml
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       rexml

+      rubocop-ast (>= 0.0.3)

       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)

+    rubocop-ast (0.0.3)
+      parser (>= 2.7.0.1)

     rubocop-minitest (0.9.0)
       rubocop (>= 0.74)
     rubocop-minitest (0.9.0)
       rubocop (>= 0.74)

-    rubocop-performance (1.5.2)
+    rubocop-performance (1.6.0)

       rubocop (>= 0.71.0)
     rubocop-rails (2.5.2)
       activesupport
       rubocop (>= 0.71.0)
     rubocop-rails (2.5.2)
       activesupport


@@ -455,7 +458,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)

-    websocket-driver (0.7.1)
+    websocket-driver (0.7.2)

       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
     xpath (3.2.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
     xpath (3.2.0)