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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 925d57d06880d7aa2fe013593660392a3eb9f853..fc7c216c2322041fba14882c7e449d90244add0f 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
 GEM
   remote: https://rubygems.org/
   specs:

-    aasm (5.3.0)
+    aasm (5.3.1)

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


@@ -86,8 +86,8 @@ GEM
     autoprefixer-rails (10.4.7.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)
     autoprefixer-rails (10.4.7.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)

-    aws-partitions (1.628.0)
-    aws-sdk-core (3.144.0)
+    aws-partitions (1.637.0)
+    aws-sdk-core (3.155.0)

       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)


@@ -149,7 +149,7 @@ GEM
     config (4.0.0)
       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)
     config (4.0.0)
       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)

-    connection_pool (2.2.5)
+    connection_pool (2.3.0)

     crack (0.4.5)
       rexml
     crass (1.0.6)
     crack (0.4.5)
       rexml
     crass (1.0.6)


@@ -165,12 +165,12 @@ GEM
     docile (1.4.0)
     doorkeeper (5.6.0)
       railties (>= 5)
     docile (1.4.0)
     doorkeeper (5.6.0)
       railties (>= 5)

-    doorkeeper-i18n (5.2.4)
+    doorkeeper-i18n (5.2.5)

       doorkeeper (>= 5.2)
     dry-configurable (0.15.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.6)
       doorkeeper (>= 5.2)
     dry-configurable (0.15.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.6)

-    dry-container (0.10.1)
+    dry-container (0.11.0)

       concurrent-ruby (~> 1.0)
     dry-core (0.8.1)
       concurrent-ruby (~> 1.0)
       concurrent-ruby (~> 1.0)
     dry-core (0.8.1)
       concurrent-ruby (~> 1.0)


@@ -179,12 +179,12 @@ 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.10.2)
+    dry-schema (1.10.5)

       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.13, >= 0.13.0)
       dry-core (~> 0.5, >= 0.5)
       dry-initializer (~> 3.0)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.13, >= 0.13.0)
       dry-core (~> 0.5, >= 0.5)
       dry-initializer (~> 3.0)

-      dry-logic (~> 1.0)
+      dry-logic (~> 1.2)

       dry-types (~> 1.5)
     dry-types (1.5.1)
       concurrent-ruby (~> 1.0)
       dry-types (~> 1.5)
     dry-types (1.5.1)
       concurrent-ruby (~> 1.0)


@@ -249,7 +249,7 @@ GEM
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)

-    image_size (3.0.2)
+    image_size (3.1.0)

     in_threads (1.6.0)
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
     in_threads (1.6.0)
     jbuilder (2.11.5)
       actionview (>= 5.0.0)


@@ -271,7 +271,7 @@ GEM
     logstasher (2.1.5)
       activesupport (>= 5.2)
       request_store
     logstasher (2.1.5)
       activesupport (>= 5.2)
       request_store

-    loofah (2.18.0)
+    loofah (2.19.0)

       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)


@@ -311,35 +311,36 @@ GEM
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack

-    oauth2 (1.4.10)
+    oauth2 (2.0.9)

       faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
       faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)

-      multi_json (~> 1.3)

       multi_xml (~> 0.5)
       multi_xml (~> 0.5)

-      rack (>= 1.2, < 3)
+      rack (>= 1.2, < 4)
+      snaky_hash (~> 2.0)
+      version_gem (~> 1.1)

     omniauth (2.0.4)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
       rack-protection
     omniauth-facebook (9.0.0)
       omniauth-oauth2 (~> 1.2)
     omniauth (2.0.4)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
       rack-protection
     omniauth-facebook (9.0.0)
       omniauth-oauth2 (~> 1.2)

-    omniauth-github (2.0.0)
+    omniauth-github (2.0.1)

       omniauth (~> 2.0)
       omniauth (~> 2.0)

-      omniauth-oauth2 (~> 1.7.1)
-    omniauth-google-oauth2 (1.0.1)
+      omniauth-oauth2 (~> 1.8)
+    omniauth-google-oauth2 (1.1.1)

       jwt (>= 2.0)
       jwt (>= 2.0)

-      oauth2 (~> 1.1)
+      oauth2 (~> 2.0.6)

       omniauth (~> 2.0)
       omniauth (~> 2.0)

-      omniauth-oauth2 (~> 1.7.1)
+      omniauth-oauth2 (~> 1.8.0)

     omniauth-mediawiki (0.0.4)
       jwt (~> 2.0)
       omniauth-oauth (~> 1.0)
     omniauth-oauth (1.2.0)
       oauth
       omniauth (>= 1.0, < 3)
     omniauth-mediawiki (0.0.4)
       jwt (~> 2.0)
       omniauth-oauth (~> 1.0)
     omniauth-oauth (1.2.0)
       oauth
       omniauth (>= 1.0, < 3)

-    omniauth-oauth2 (1.7.3)
+    omniauth-oauth2 (1.8.0)

       oauth2 (>= 1.4, < 3)
       oauth2 (>= 1.4, < 3)

-      omniauth (>= 1.9, < 3)
+      omniauth (~> 2.0)

     omniauth-openid (2.0.1)
       omniauth (>= 1.0, < 3.0)
       rack-openid (~> 1.4.0)
     omniauth-openid (2.0.1)
       omniauth (>= 1.0, < 3.0)
       rack-openid (~> 1.4.0)


@@ -354,7 +355,7 @@ GEM
     parser (3.1.2.1)
       ast (~> 2.4.1)
     pg (1.4.3)
     parser (3.1.2.1)
       ast (~> 2.4.1)
     pg (1.4.3)

-    popper_js (2.11.5)
+    popper_js (2.11.6)

     progress (3.6.0)
     public_suffix (5.0.0)
     puma (5.6.5)
     progress (3.6.0)
     public_suffix (5.0.0)
     puma (5.6.5)


@@ -368,7 +369,7 @@ GEM
     rack-openid (1.4.2)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-openid (1.4.2)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)

-    rack-protection (2.2.2)
+    rack-protection (3.0.1)

       rack
     rack-test (2.0.2)
       rack (>= 1.3)
       rack
     rack-test (2.0.2)
       rack (>= 1.3)


@@ -411,7 +412,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)

-    regexp_parser (2.5.0)
+    regexp_parser (2.6.0)

     request_store (1.5.1)
       rack (>= 1.4)
     rexml (3.2.5)
     request_store (1.5.1)
       rack (>= 1.4)
     rexml (3.2.5)


@@ -429,12 +430,12 @@ GEM
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.21.0)
       parser (>= 3.1.1.0)
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.21.0)
       parser (>= 3.1.1.0)

-    rubocop-minitest (0.22.0)
+    rubocop-minitest (0.22.1)

       rubocop (>= 0.90, < 2.0)
       rubocop (>= 0.90, < 2.0)

-    rubocop-performance (1.14.3)
+    rubocop-performance (1.15.0)

       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)

-    rubocop-rails (2.16.0)
+    rubocop-rails (2.16.1)

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


@@ -471,6 +472,9 @@ GEM
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
     smart_properties (1.17.0)

+    snaky_hash (2.0.1)
+      hashie
+      version_gem (~> 1.1, >= 1.1.1)

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


@@ -481,7 +485,7 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)

-    strong_migrations (1.3.0)
+    strong_migrations (1.3.1)

       activerecord (>= 5.2)
     strscan (3.0.4)
     terser (1.1.12)
       activerecord (>= 5.2)
     strscan (3.0.4)
     terser (1.1.12)


@@ -491,10 +495,11 @@ GEM
     timeout (0.3.0)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     timeout (0.3.0)
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)

-    unicode-display_width (2.2.0)
+    unicode-display_width (2.3.0)

     validates_email_format_of (1.7.2)
       i18n
     vendorer (0.2.0)
     validates_email_format_of (1.7.2)
       i18n
     vendorer (0.2.0)

+    version_gem (1.1.1)

     webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
     webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)