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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 1551295ddd2ce2a8f25afdf62ca7d05a591c54d2..e712649382e1e1cee0a8d946211f8d0123c063ec 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -77,8 +77,8 @@ GEM
     autoprefixer-rails (10.3.3.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)
     autoprefixer-rails (10.3.3.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)

-    aws-partitions (1.516.0)
-    aws-sdk-core (3.121.2)
+    aws-partitions (1.519.0)
+    aws-sdk-core (3.121.3)

       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)


@@ -123,8 +123,9 @@ GEM
     cancancan (3.3.0)
     canonical-rails (0.2.12)
       rails (>= 4.1, < 6.2)
     cancancan (3.3.0)
     canonical-rails (0.2.12)
       rails (>= 4.1, < 6.2)

-    capybara (3.35.3)
+    capybara (3.36.0)

       addressable
       addressable

+      matrix

       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)


@@ -143,7 +144,7 @@ GEM
     crack (0.4.5)
       rexml
     crass (1.0.6)
     crack (0.4.5)
       rexml
     crass (1.0.6)

-    dalli (3.0.2)
+    dalli (3.0.3)

     debug_inspector (1.1.0)
     deep_merge (1.2.1)
     delayed_job (4.1.9)
     debug_inspector (1.1.0)
     deep_merge (1.2.1)
     delayed_job (4.1.9)


@@ -240,10 +241,10 @@ GEM
       concurrent-ruby (~> 1.0)
     i18n-js (3.9.0)
       i18n (>= 0.6.6)
       concurrent-ruby (~> 1.0)
     i18n-js (3.9.0)
       i18n (>= 0.6.6)

-    image_optim (0.31.0)
+    image_optim (0.31.1)

       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)

-      image_size (>= 1.5, < 3)
+      image_size (>= 1.5, < 4)

       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
     image_optim_rails (0.4.3)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
     image_optim_rails (0.4.3)


@@ -253,7 +254,7 @@ GEM
     image_processing (1.12.1)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
     image_processing (1.12.1)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)

-    image_size (2.1.2)
+    image_size (3.0.1)

     in_threads (1.5.4)
     jbuilder (2.11.2)
       activesupport (>= 5.0.0)
     in_threads (1.5.4)
     jbuilder (2.11.2)
       activesupport (>= 5.0.0)


@@ -262,7 +263,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)

-    json (2.6.0)
+    json (2.6.1)

     jwt (2.3.0)
     kgio (2.11.4)
     kramdown (2.3.1)
     jwt (2.3.0)
     kgio (2.11.4)
     kramdown (2.3.1)


@@ -280,6 +281,7 @@ GEM
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (1.0.2)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (1.0.2)

+    matrix (0.4.2)

     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)


@@ -310,7 +312,7 @@ GEM
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
       rack-protection
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
       rack-protection

-    omniauth-facebook (8.0.0)
+    omniauth-facebook (9.0.0)

       omniauth-oauth2 (~> 1.2)
     omniauth-github (2.0.0)
       omniauth (~> 2.0)
       omniauth-oauth2 (~> 1.2)
     omniauth-github (2.0.0)
       omniauth (~> 2.0)


@@ -406,7 +408,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.22.1)
+    rubocop (1.22.2)

       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)


@@ -485,7 +487,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.2)
+    zeitwerk (2.5.1)

 
 PLATFORMS
   ruby
 
 PLATFORMS
   ruby