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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 4ae3a72a2b9e0a13d8622e37873cb33d2954657d..3b3ffaf060bc9b19e20a7cc569e543b9159b8482 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.0)

       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)


@@ -71,7 +71,7 @@ GEM
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.1)
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.1)

-    autoprefixer-rails (9.8.5)
+    autoprefixer-rails (9.8.6.1)

       execjs
     aws-eventstream (1.1.0)
     aws-partitions (1.343.0)
       execjs
     aws-eventstream (1.1.0)
     aws-partitions (1.343.0)


@@ -110,7 +110,10 @@ GEM
       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)


@@ -221,7 +224,7 @@ GEM
     html_tokenizer (0.0.7)
     htmlentities (4.3.4)
     http_accept_language (2.1.1)
     html_tokenizer (0.0.7)
     htmlentities (4.3.4)
     http_accept_language (2.1.1)

-    i18n (1.8.3)
+    i18n (1.8.5)

       concurrent-ruby (~> 1.0)
     i18n-js (3.7.1)
       i18n (>= 0.6.6)
       concurrent-ruby (~> 1.0)
     i18n-js (3.7.1)
       i18n (>= 0.6.6)


@@ -385,8 +388,7 @@ 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)
+    rotp (6.1.0)

     rubocop (0.86.0)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
     rubocop (0.86.0)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)


@@ -439,7 +441,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.6.8)
+    strong_migrations (0.7.1)

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


@@ -466,7 +468,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)

-    zeitwerk (2.3.1)
+    zeitwerk (2.4.0)

 
 PLATFORMS
   ruby
 
 PLATFORMS
   ruby


@@ -485,6 +487,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


@@ -554,4 +557,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
   webmock
 
 BUNDLED WITH

-   1.17.2
+   2.1.4