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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 0d3627354af6ea3fcbfe576433b6ccb5471cf8fb..1d868a95b31aa7712bb06721f712e6b1fc2cd288 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -52,7 +52,7 @@ GEM
     activerecord (6.0.3.4)
       activemodel (= 6.0.3.4)
       activesupport (= 6.0.3.4)
     activerecord (6.0.3.4)
       activemodel (= 6.0.3.4)
       activesupport (= 6.0.3.4)

-    activerecord-import (1.0.6)
+    activerecord-import (1.0.7)

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


@@ -71,11 +71,11 @@ 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 (10.0.1.0)
+    autoprefixer-rails (10.0.1.3)

       execjs
     aws-eventstream (1.1.0)
       execjs
     aws-eventstream (1.1.0)

-    aws-partitions (1.380.0)
-    aws-sdk-core (3.109.0)
+    aws-partitions (1.390.0)
+    aws-sdk-core (3.109.2)

       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,13 +83,13 @@ 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.83.0)
+    aws-sdk-s3 (1.84.0)

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

-    better_errors (2.8.3)
+    better_errors (2.9.1)

       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)


@@ -104,9 +104,9 @@ 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.8)
+    bootsnap (1.5.0)

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

-    bootstrap (4.5.2)
+    bootstrap (4.5.3)

       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)


@@ -209,8 +209,9 @@ GEM
     factory_bot_rails (6.1.0)
       factory_bot (~> 6.1.0)
       railties (>= 5.0.0)
     factory_bot_rails (6.1.0)
       factory_bot (~> 6.1.0)
       railties (>= 5.0.0)

-    faraday (1.0.1)
+    faraday (1.1.0)

       multipart-post (>= 1.2, < 3)
       multipart-post (>= 1.2, < 3)

+      ruby2_keywords

     ffi (1.13.1)
     ffi-libarchive (1.0.4)
       ffi (~> 1.0)
     ffi (1.13.1)
     ffi-libarchive (1.0.4)
       ffi (~> 1.0)


@@ -252,8 +253,8 @@ GEM
     kgio (2.11.3)
     kramdown (2.3.0)
       rexml
     kgio (2.11.3)
     kramdown (2.3.0)
       rexml

-    libxml-ruby (3.2.0)
-    listen (3.2.1)
+    libxml-ruby (3.2.1)
+    listen (3.3.0)

       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)


@@ -271,7 +272,7 @@ GEM
     maxminddb (0.1.22)
     method_source (1.0.0)
     mimemagic (0.3.5)
     maxminddb (0.1.22)
     method_source (1.0.0)
     mimemagic (0.3.5)

-    mini_magick (4.10.1)
+    mini_magick (4.11.0)

     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.2)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.2)


@@ -299,7 +300,7 @@ GEM
     omniauth (1.9.1)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
     omniauth (1.9.1)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)

-    omniauth-facebook (7.0.0)
+    omniauth-facebook (8.0.0)

       omniauth-oauth2 (~> 1.2)
     omniauth-github (1.4.0)
       omniauth (~> 1.5)
       omniauth-oauth2 (~> 1.2)
     omniauth-github (1.4.0)
       omniauth (~> 1.5)


@@ -332,7 +333,7 @@ GEM
     progress (3.5.2)
     psych (3.2.0)
     public_suffix (4.0.6)
     progress (3.5.2)
     psych (3.2.0)
     public_suffix (4.0.6)

-    puma (5.0.2)
+    puma (5.0.4)

       nio4r (~> 2.0)
     quad_tile (1.0.1)
     r2 (0.2.7)
       nio4r (~> 2.0)
     quad_tile (1.0.1)
     r2 (0.2.7)


@@ -411,6 +412,7 @@ GEM
       rubocop (>= 0.87.0)
     ruby-openid (2.9.2)
     ruby-progressbar (1.10.1)
       rubocop (>= 0.87.0)
     ruby-openid (2.9.2)
     ruby-progressbar (1.10.1)

+    ruby2_keywords (0.0.2)

     rubyzip (2.3.0)
     sanitize (5.2.1)
       crass (~> 1.0.2)
     rubyzip (2.3.0)
     sanitize (5.2.1)
       crass (~> 1.0.2)


@@ -441,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.1)
+    strong_migrations (0.7.2)

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


@@ -451,7 +453,7 @@ GEM
     tilt (2.0.10)
     tins (1.25.0)
       sync
     tilt (2.0.10)
     tins (1.25.0)
       sync

-    tzinfo (1.2.7)
+    tzinfo (1.2.8)

       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)


@@ -459,7 +461,7 @@ GEM
     validates_email_format_of (1.6.3)
       i18n
     vendorer (0.2.0)
     validates_email_format_of (1.6.3)
       i18n
     vendorer (0.2.0)

-    webmock (3.9.2)
+    webmock (3.9.5)

       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)


@@ -468,7 +470,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.4.0)
+    zeitwerk (2.4.1)

 
 PLATFORMS
   ruby
 
 PLATFORMS
   ruby