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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 209ebc544ef5c9dcd911575d470b80fd14d1a555..ae451798e5936345c2674e99d667708806fee867 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -72,21 +72,21 @@ GEM
     ast (2.4.2)
     autoprefixer-rails (10.2.4.0)
       execjs
     ast (2.4.2)
     autoprefixer-rails (10.2.4.0)
       execjs

-    aws-eventstream (1.1.0)
-    aws-partitions (1.430.0)
-    aws-sdk-core (3.112.0)
+    aws-eventstream (1.1.1)
+    aws-partitions (1.434.0)
+    aws-sdk-core (3.113.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.42.0)
+    aws-sdk-kms (1.43.0)

       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)

-    aws-sdk-s3 (1.89.0)
+    aws-sdk-s3 (1.92.0)

       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)

-    aws-sigv4 (1.2.2)
+    aws-sigv4 (1.2.3)

       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)


@@ -102,7 +102,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.2)
+    bootsnap (1.7.3)

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


@@ -203,7 +203,7 @@ GEM
       multipart-post (>= 1.2, < 3)
       ruby2_keywords
     faraday-net_http (1.0.1)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords
     faraday-net_http (1.0.1)

-    ffi (1.14.2)
+    ffi (1.15.0)

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


@@ -218,7 +218,7 @@ GEM
     http_accept_language (2.1.1)
     i18n (1.8.9)
       concurrent-ruby (~> 1.0)
     http_accept_language (2.1.1)
     i18n (1.8.9)
       concurrent-ruby (~> 1.0)

-    i18n-js (3.8.1)
+    i18n-js (3.8.2)

       i18n (>= 0.6.6)
     image_optim (0.28.0)
       exifr (~> 1.2, >= 1.2.2)
       i18n (>= 0.6.6)
     image_optim (0.28.0)
       exifr (~> 1.2, >= 1.2.2)


@@ -242,10 +242,10 @@ GEM
     json (2.5.1)
     jwt (2.2.2)
     kgio (2.11.3)
     json (2.5.1)
     jwt (2.2.2)
     kgio (2.11.3)

-    kramdown (2.3.0)
+    kramdown (2.3.1)

       rexml
     libxml-ruby (3.2.1)
       rexml
     libxml-ruby (3.2.1)

-    listen (3.4.1)
+    listen (3.5.0)

       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logstasher (2.1.5)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logstasher (2.1.5)


@@ -260,7 +260,7 @@ GEM
       mimemagic (~> 0.3.2)
     maxminddb (0.1.22)
     method_source (1.0.0)
       mimemagic (~> 0.3.2)
     maxminddb (0.1.22)
     method_source (1.0.0)

-    mimemagic (0.3.5)
+    mimemagic (0.3.6)

     mini_magick (4.11.0)
     mini_mime (1.0.2)
     mini_portile2 (2.5.0)
     mini_magick (4.11.0)
     mini_mime (1.0.2)
     mini_portile2 (2.5.0)


@@ -269,11 +269,11 @@ GEM
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)

-    nio4r (2.5.5)
-    nokogiri (1.11.1)
+    nio4r (2.5.7)
+    nokogiri (1.11.2)

       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)

-    nokogumbo (2.0.4)
+    nokogumbo (2.0.5)

       nokogiri (~> 1.8, >= 1.8.4)
     oauth (0.4.7)
     oauth-plugin (0.5.1)
       nokogiri (~> 1.8, >= 1.8.4)
     oauth (0.4.7)
     oauth-plugin (0.5.1)


@@ -281,7 +281,7 @@ GEM
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack

-    oauth2 (1.4.4)
+    oauth2 (1.4.7)

       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)


@@ -296,11 +296,11 @@ GEM
     omniauth-github (2.0.0)
       omniauth (~> 2.0)
       omniauth-oauth2 (~> 1.7.1)
     omniauth-github (2.0.0)
       omniauth (~> 2.0)
       omniauth-oauth2 (~> 1.7.1)

-    omniauth-google-oauth2 (0.8.1)
+    omniauth-google-oauth2 (1.0.0)

       jwt (>= 2.0)
       oauth2 (~> 1.1)
       jwt (>= 2.0)
       oauth2 (~> 1.1)

-      omniauth (>= 1.1.1)
-      omniauth-oauth2 (>= 1.6)
+      omniauth (~> 2.0)
+      omniauth-oauth2 (~> 1.7.1)

     omniauth-mediawiki (0.0.4)
       jwt (~> 2.0)
       omniauth-oauth (~> 1.0)
     omniauth-mediawiki (0.0.4)
       jwt (~> 2.0)
       omniauth-oauth (~> 1.0)


@@ -327,7 +327,7 @@ GEM
     popper_js (1.16.0)
     progress (3.5.2)
     public_suffix (4.0.6)
     popper_js (1.16.0)
     progress (3.5.2)
     public_suffix (4.0.6)

-    puma (5.2.1)
+    puma (5.2.2)

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


@@ -387,7 +387,7 @@ GEM
     rexml (3.2.4)
     rinku (2.0.6)
     rotp (6.2.0)
     rexml (3.2.4)
     rinku (2.0.6)
     rotp (6.2.0)

-    rubocop (1.11.0)
+    rubocop (1.12.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)


@@ -398,9 +398,9 @@ GEM
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.4.1)
       parser (>= 2.7.1.5)
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.4.1)
       parser (>= 2.7.1.5)

-    rubocop-minitest (0.10.3)
-      rubocop (>= 0.87, < 2.0)
-    rubocop-performance (1.10.1)
+    rubocop-minitest (0.11.0)
+      rubocop (>= 0.90, < 2.0)
+    rubocop-performance (1.10.2)

       rubocop (>= 0.90.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rails (2.9.1)
       rubocop (>= 0.90.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rails (2.9.1)


@@ -455,7 +455,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.12.0)
+    webmock (3.12.1)

       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)


@@ -553,4 +553,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
   webmock
 
 BUNDLED WITH

-   2.1.4
+   2.2.8