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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index e5ead63f10a0a16b64a8b63a9f87cf441ff0ecd4..30802fd1145feb6a810b8f2b8db7107ed87e781c 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -74,23 +74,23 @@ GEM
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.2)
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.2)

-    autoprefixer-rails (10.3.1.0)
+    autoprefixer-rails (10.3.3.0)

       execjs (~> 2)
       execjs (~> 2)

-    aws-eventstream (1.1.1)
-    aws-partitions (1.489.0)
-    aws-sdk-core (3.119.1)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.496.0)
+    aws-sdk-core (3.121.0)

       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)

-    aws-sdk-kms (1.46.0)
-      aws-sdk-core (~> 3, >= 3.119.0)
+    aws-sdk-kms (1.48.0)
+      aws-sdk-core (~> 3, >= 3.120.0)

       aws-sigv4 (~> 1.1)
       aws-sigv4 (~> 1.1)

-    aws-sdk-s3 (1.99.0)
-      aws-sdk-core (~> 3, >= 3.119.0)
+    aws-sdk-s3 (1.102.0)
+      aws-sdk-core (~> 3, >= 3.120.0)

       aws-sdk-kms (~> 1)
       aws-sdk-kms (~> 1)

-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.4)
+      aws-sigv4 (~> 1.4)
+    aws-sigv4 (1.4.0)

       aws-eventstream (~> 1, >= 1.0.2)
     better_errors (2.9.1)
       coderay (>= 1.0.0)
       aws-eventstream (~> 1, >= 1.0.2)
     better_errors (2.9.1)
       coderay (>= 1.0.0)


@@ -106,7 +106,7 @@ GEM
       smart_properties
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
       smart_properties
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)

-    bootsnap (1.7.7)
+    bootsnap (1.8.1)

       msgpack (~> 1.0)
     bootstrap (4.5.3)
       autoprefixer-rails (>= 9.1.0)
       msgpack (~> 1.0)
     bootstrap (4.5.3)
       autoprefixer-rails (>= 9.1.0)


@@ -121,7 +121,7 @@ GEM
     bzip2-ffi (1.1.0)
       ffi (~> 1.0)
     cancancan (3.3.0)
     bzip2-ffi (1.1.0)
       ffi (~> 1.0)
     cancancan (3.3.0)

-    canonical-rails (0.2.11)
+    canonical-rails (0.2.12)

       rails (>= 4.1, < 6.2)
     capybara (3.35.3)
       addressable
       rails (>= 4.1, < 6.2)
     capybara (3.35.3)
       addressable


@@ -169,7 +169,7 @@ GEM
     dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)
     dry-logic (1.2.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.5, >= 0.5)

-    dry-schema (1.7.0)
+    dry-schema (1.7.1)

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


@@ -205,7 +205,7 @@ 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.7.0)
+    faraday (1.7.1)

       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)


@@ -224,7 +224,7 @@ GEM
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)

-    ffi (1.15.3)
+    ffi (1.15.4)

     ffi-libarchive (1.0.17)
       ffi (~> 1.0)
     fspath (3.1.2)
     ffi-libarchive (1.0.17)
       ffi (~> 1.0)
     fspath (3.1.2)


@@ -284,7 +284,7 @@ GEM
     maxminddb (0.1.22)
     method_source (1.0.0)
     mini_magick (4.11.0)
     maxminddb (0.1.22)
     method_source (1.0.0)
     mini_magick (4.11.0)

-    mini_mime (1.1.0)
+    mini_mime (1.1.1)

     mini_portile2 (2.6.1)
     minitest (5.14.4)
     msgpack (1.4.2)
     mini_portile2 (2.6.1)
     minitest (5.14.4)
     msgpack (1.4.2)


@@ -292,7 +292,7 @@ GEM
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     nio4r (2.5.8)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     nio4r (2.5.8)

-    nokogiri (1.12.3)
+    nokogiri (1.12.4)

       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
     oauth (0.4.7)
       mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
     oauth (0.4.7)


@@ -385,7 +385,7 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)

-    rails-html-sanitizer (1.4.1)
+    rails-html-sanitizer (1.4.2)

       loofah (~> 2.3)
     rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
       loofah (~> 2.3)
     rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)


@@ -407,7 +407,7 @@ GEM
     rexml (3.2.5)
     rinku (2.0.6)
     rotp (6.2.0)
     rexml (3.2.5)
     rinku (2.0.6)
     rotp (6.2.0)

-    rubocop (1.19.1)
+    rubocop (1.20.0)

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


@@ -416,7 +416,7 @@ GEM
       rubocop-ast (>= 1.9.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
       rubocop-ast (>= 1.9.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)

-    rubocop-ast (1.10.0)
+    rubocop-ast (1.11.0)

       parser (>= 3.0.1.1)
     rubocop-minitest (0.15.0)
       rubocop (>= 0.90, < 2.0)
       parser (>= 3.0.1.1)
     rubocop-minitest (0.15.0)
       rubocop (>= 0.90, < 2.0)


@@ -431,7 +431,7 @@ GEM
       rubocop (~> 1.0)
     ruby-openid (2.9.2)
     ruby-progressbar (1.11.0)
       rubocop (~> 1.0)
     ruby-openid (2.9.2)
     ruby-progressbar (1.11.0)

-    ruby-vips (2.1.2)
+    ruby-vips (2.1.3)

       ffi (~> 1.12)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
       ffi (~> 1.12)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)


@@ -457,7 +457,7 @@ GEM
     simplecov-html (0.12.3)
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.3)
     simplecov-html (0.12.3)
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.3)

-    smart_properties (1.16.0)
+    smart_properties (1.16.2)

     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)