Update bundle

diff --git a/Gemfile b/Gemfile
index 7ee75cb664d401ae834e7b99965877e1fba99eed..7bb5d705452c52e8fdbc0d062e6d7bef4ef1cce2 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -43,7 +43,7 @@ gem "active_record_union"
 gem "bootstrap", "~> 4.5.0"
 gem "bootstrap_form", "~> 4.0"
 gem "cancancan"
 gem "bootstrap", "~> 4.5.0"
 gem "bootstrap_form", "~> 4.0"
 gem "cancancan"

-gem "composite_primary_keys", "~> 13.0.0", "!= 13.0.1"
+gem "composite_primary_keys", "~> 13.0.0"

 gem "config"
 gem "delayed_job_active_record"
 gem "http_accept_language", "~> 2.1.1"
 gem "config"
 gem "delayed_job_active_record"
 gem "http_accept_language", "~> 2.1.1"

diff --git a/Gemfile.lock b/Gemfile.lock
index 53dfdd5dc191a1b42f30726f9b2df8210910ad9d..f9701d415de037e1459582ea3785f281518a9195 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -80,8 +80,8 @@ GEM
     autoprefixer-rails (10.4.0.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)
     autoprefixer-rails (10.4.0.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)

-    aws-partitions (1.544.0)
-    aws-sdk-core (3.125.0)
+    aws-partitions (1.547.0)
+    aws-sdk-core (3.125.1)

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


@@ -89,7 +89,7 @@ GEM
     aws-sdk-kms (1.53.0)
       aws-sdk-core (~> 3, >= 3.125.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-kms (1.53.0)
       aws-sdk-core (~> 3, >= 3.125.0)
       aws-sigv4 (~> 1.1)

-    aws-sdk-s3 (1.110.0)
+    aws-sdk-s3 (1.111.1)

       aws-sdk-core (~> 3, >= 3.125.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
       aws-sdk-core (~> 3, >= 3.125.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)


@@ -137,10 +137,10 @@ GEM
       xpath (~> 3.2)
     childprocess (3.0.0)
     coderay (1.1.3)
       xpath (~> 3.2)
     childprocess (3.0.0)
     coderay (1.1.3)

-    composite_primary_keys (13.0.0)
+    composite_primary_keys (13.0.3)

       activerecord (~> 6.1.0)
     concurrent-ruby (1.1.9)
       activerecord (~> 6.1.0)
     concurrent-ruby (1.1.9)

-    config (3.1.0)
+    config (3.1.1)

       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)
     connection_pool (2.2.5)
       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)
     connection_pool (2.2.5)


@@ -149,7 +149,7 @@ GEM
     crass (1.0.6)
     dalli (3.2.0)
     debug_inspector (1.1.0)
     crass (1.0.6)
     dalli (3.2.0)
     debug_inspector (1.1.0)

-    deep_merge (1.2.1)
+    deep_merge (1.2.2)

     delayed_job (4.1.9)
       activesupport (>= 3.0, < 6.2)
     delayed_job_active_record (4.1.6)
     delayed_job (4.1.9)
       activesupport (>= 3.0, < 6.2)
     delayed_job_active_record (4.1.6)


@@ -208,25 +208,29 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)

-    faraday (1.8.0)
+    faraday (1.9.3)

       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)

-      faraday-httpclient (~> 1.0.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)

       faraday-net_http (~> 1.0)
       faraday-net_http (~> 1.0)

-      faraday-net_http_persistent (~> 1.1)
+      faraday-net_http_persistent (~> 1.0)

       faraday-patron (~> 1.0)
       faraday-rack (~> 1.0)
       faraday-patron (~> 1.0)
       faraday-rack (~> 1.0)

-      multipart-post (>= 1.2, < 3)
+      faraday-retry (~> 1.0)

       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)

+    faraday-multipart (1.0.3)
+      multipart-post (>= 1.2, < 3)

     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)

+    faraday-retry (1.0.3)

     ffi (1.15.4)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
     ffi (1.15.4)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)


@@ -293,15 +297,15 @@ GEM
     method_source (1.0.0)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
     method_source (1.0.0)
     mini_magick (4.11.0)
     mini_mime (1.1.2)

-    mini_portile2 (2.6.1)
+    mini_portile2 (2.7.1)

     minitest (5.15.0)
     msgpack (1.4.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     nio4r (2.5.8)
     minitest (5.15.0)
     msgpack (1.4.2)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     nio4r (2.5.8)

-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.0)
+      mini_portile2 (~> 2.7.0)

       racc (~> 1.4)
     oauth (0.4.7)
     oauth-plugin (0.5.1)
       racc (~> 1.4)
     oauth (0.4.7)
     oauth-plugin (0.5.1)


@@ -431,7 +435,7 @@ GEM
     rubocop-performance (1.13.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-performance (1.13.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)

-    rubocop-rails (2.13.0)
+    rubocop-rails (2.13.1)

       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)


@@ -477,7 +481,7 @@ GEM
       activerecord (>= 5)
     terser (1.1.8)
       execjs (>= 0.3.0, < 3)
       activerecord (>= 5)
     terser (1.1.8)
       execjs (>= 0.3.0, < 3)

-    thor (1.1.0)
+    thor (1.2.1)

     tilt (2.0.10)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     tilt (2.0.10)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)


@@ -519,7 +523,7 @@ DEPENDENCIES
   cancancan
   canonical-rails
   capybara (>= 2.15)
   cancancan
   canonical-rails
   capybara (>= 2.15)

-  composite_primary_keys (~> 13.0.0, != 13.0.1)
+  composite_primary_keys (~> 13.0.0)

   config
   connection_pool
   dalli
   config
   connection_pool
   dalli