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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 9e950374ed6a8afa9c3ba947c9fa0b071b24dbdc..880d287ec15d548997e3c8096f5632bb5dcd100a 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)

-    aasm (5.0.8)
+    aasm (5.1.1)

       concurrent-ruby (~> 1.0)
     actioncable (6.0.3.2)
       actionpack (= 6.0.3.2)
       concurrent-ruby (~> 1.0)
     actioncable (6.0.3.2)
       actionpack (= 6.0.3.2)


@@ -52,7 +52,7 @@ GEM
     activerecord (6.0.3.2)
       activemodel (= 6.0.3.2)
       activesupport (= 6.0.3.2)
     activerecord (6.0.3.2)
       activemodel (= 6.0.3.2)
       activesupport (= 6.0.3.2)

-    activerecord-import (1.0.5)
+    activerecord-import (1.0.6)

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


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

-    aws-partitions (1.343.0)
-    aws-sdk-core (3.104.1)
+    aws-partitions (1.354.0)
+    aws-sdk-core (3.104.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,8 +83,8 @@ GEM
     aws-sdk-kms (1.36.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-kms (1.36.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)

-    aws-sdk-s3 (1.75.0)
-      aws-sdk-core (~> 3, >= 3.104.1)
+    aws-sdk-s3 (1.77.0)
+      aws-sdk-core (~> 3, >= 3.104.3)

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


@@ -104,13 +104,16 @@ GEM
     bigdecimal (1.1.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     bigdecimal (1.1.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)

-    bootsnap (1.4.7)
+    bootsnap (1.4.8)

       msgpack (~> 1.0)
       msgpack (~> 1.0)

-    bootstrap (4.5.0)
+    bootstrap (4.5.2)

       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 1.14.3, < 2)
       sassc-rails (>= 2.0.0)
       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 1.14.3, < 2)
       sassc-rails (>= 2.0.0)

-    brakeman (4.8.2)
+    bootstrap_form (4.5.0)
+      actionpack (>= 5.2)
+      activemodel (>= 5.2)
+    brakeman (4.9.0)

     browser (4.2.0)
     builder (3.2.4)
     bzip2-ffi (1.0.0)
     browser (4.2.0)
     builder (3.2.4)
     bzip2-ffi (1.0.0)


@@ -130,7 +133,7 @@ GEM
     coderay (1.1.3)
     composite_primary_keys (12.0.2)
       activerecord (~> 6.0.0)
     coderay (1.1.3)
     composite_primary_keys (12.0.2)
       activerecord (~> 6.0.0)

-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)

     config (2.2.1)
       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)
     config (2.2.1)
       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)


@@ -183,7 +186,7 @@ GEM
       dry-equalizer (~> 0.3)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
       dry-equalizer (~> 0.3)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)

-    dry-validation (1.5.1)
+    dry-validation (1.5.3)

       concurrent-ruby (~> 1.0)
       dry-container (~> 0.7, >= 0.7.1)
       dry-core (~> 0.4)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.7, >= 0.7.1)
       dry-core (~> 0.4)


@@ -191,10 +194,11 @@ 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.34)
+    erb_lint (0.0.35)

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

+      parser (>= 2.7.1.4)

       rainbow
       rubocop (~> 0.79)
       smart_properties
       rainbow
       rubocop (~> 0.79)
       smart_properties


@@ -273,7 +277,7 @@ GEM
     mini_portile2 (2.4.0)
     minitest (5.14.1)
     msgpack (1.3.3)
     mini_portile2 (2.4.0)
     minitest (5.14.1)
     msgpack (1.3.3)

-    multi_json (1.14.1)
+    multi_json (1.15.0)

     multi_xml (0.6.0)
     multipart-post (2.1.1)
     nio4r (2.5.2)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     nio4r (2.5.2)


@@ -327,7 +331,7 @@ GEM
     pg (1.2.3)
     popper_js (1.16.0)
     progress (3.5.2)
     pg (1.2.3)
     popper_js (1.16.0)
     progress (3.5.2)

-    psych (3.1.0)
+    psych (3.2.0)

     public_suffix (4.0.5)
     puma (4.3.5)
       nio4r (~> 2.0)
     public_suffix (4.0.5)
     puma (4.3.5)
       nio4r (~> 2.0)


@@ -385,27 +389,26 @@ GEM
       rack (>= 1.4)
     rexml (3.2.4)
     rinku (2.0.6)
       rack (>= 1.4)
     rexml (3.2.4)
     rinku (2.0.6)

-    rotp (6.0.0)
-      addressable (~> 2.7)
-    rubocop (0.86.0)
+    rotp (6.1.0)
+    rubocop (0.89.1)

       parallel (~> 1.10)
       parallel (~> 1.10)

-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.1)

       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.7)
       rexml

-      rubocop-ast (>= 0.0.3, < 1.0)
+      rubocop-ast (>= 0.3.0, < 1.0)

       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.2.0)
-      parser (>= 2.7.0.1)
-    rubocop-minitest (0.9.0)
-      rubocop (>= 0.74)
+    rubocop-ast (0.3.0)
+      parser (>= 2.7.1.4)
+    rubocop-minitest (0.10.1)
+      rubocop (>= 0.87)

     rubocop-performance (1.7.1)
       rubocop (>= 0.82.0)
     rubocop-performance (1.7.1)
       rubocop (>= 0.82.0)

-    rubocop-rails (2.6.0)
+    rubocop-rails (2.7.1)

       activesupport (>= 4.2.0)
       rack (>= 1.1)
       activesupport (>= 4.2.0)
       rack (>= 1.1)

-      rubocop (>= 0.82.0)
+      rubocop (>= 0.87.0)

     ruby-openid (2.9.2)
     ruby-progressbar (1.10.1)
     rubyzip (2.3.0)
     ruby-openid (2.9.2)
     ruby-progressbar (1.10.1)
     rubyzip (2.3.0)


@@ -461,7 +464,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.2)
+    websocket-driver (0.7.3)

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


@@ -485,6 +488,7 @@ DEPENDENCIES
   binding_of_caller
   bootsnap (>= 1.4.2)
   bootstrap (~> 4.5.0)
   binding_of_caller
   bootsnap (>= 1.4.2)
   bootstrap (~> 4.5.0)

+  bootstrap_form (~> 4.0)

   brakeman
   browser
   bzip2-ffi
   brakeman
   browser
   bzip2-ffi