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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 06752b223c0cba44b65bfcc3bb79eb2baa62bc4d..8e23b1573303adbe596699fdaf7468ddcd437126 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -73,21 +73,24 @@ GEM
     annotate (3.1.1)
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
     annotate (3.1.1)
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)

+    argon2 (2.1.1)
+      ffi (~> 1.14)
+      ffi-compiler (~> 1.0)

     ast (2.4.2)
     autoprefixer-rails (10.3.3.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)
     ast (2.4.2)
     autoprefixer-rails (10.3.3.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)

-    aws-partitions (1.507.0)
-    aws-sdk-core (3.121.1)
+    aws-partitions (1.536.0)
+    aws-sdk-core (3.123.0)

       aws-eventstream (~> 1, >= 1.0.2)
       aws-eventstream (~> 1, >= 1.0.2)

-      aws-partitions (~> 1, >= 1.239.0)
+      aws-partitions (~> 1, >= 1.525.0)

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

-    aws-sdk-kms (1.48.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-kms (1.51.0)
+      aws-sdk-core (~> 3, >= 3.122.0)

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

-    aws-sdk-s3 (1.103.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-s3 (1.108.0)
+      aws-sdk-core (~> 3, >= 3.122.0)

       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
     aws-sigv4 (1.4.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
     aws-sigv4 (1.4.0)


@@ -106,7 +109,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.9.1)
+    bootsnap (1.9.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)


@@ -115,16 +118,17 @@ GEM
     bootstrap_form (4.5.0)
       actionpack (>= 5.2)
       activemodel (>= 5.2)
     bootstrap_form (4.5.0)
       actionpack (>= 5.2)
       activemodel (>= 5.2)

-    brakeman (5.1.1)
+    brakeman (5.1.2)

     browser (5.3.1)
     builder (3.2.4)
     bzip2-ffi (1.1.0)
       ffi (~> 1.0)
     cancancan (3.3.0)
     browser (5.3.1)
     builder (3.2.4)
     bzip2-ffi (1.1.0)
       ffi (~> 1.0)
     cancancan (3.3.0)

-    canonical-rails (0.2.12)
-      rails (>= 4.1, < 6.2)
-    capybara (3.35.3)
+    canonical-rails (0.2.13)
+      rails (>= 4.1, <= 7.0)
+    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)


@@ -139,10 +143,11 @@ GEM
     config (3.1.0)
       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)
     config (3.1.0)
       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)

+    connection_pool (2.2.5)

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

-    dalli (2.7.11)
+    dalli (3.0.5)

     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)


@@ -151,7 +156,7 @@ GEM
       activerecord (>= 3.0, < 6.2)
       delayed_job (>= 3.0, < 5)
     docile (1.4.0)
       activerecord (>= 3.0, < 6.2)
       delayed_job (>= 3.0, < 5)
     docile (1.4.0)

-    doorkeeper (5.5.3)
+    doorkeeper (5.5.4)

       railties (>= 5)
     doorkeeper-i18n (5.2.3)
       doorkeeper (>= 5.2)
       railties (>= 5)
     doorkeeper-i18n (5.2.3)
       doorkeeper (>= 5.2)


@@ -223,26 +228,29 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     ffi (1.15.4)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     ffi (1.15.4)

+    ffi-compiler (1.0.1)
+      ffi (>= 1.0.0)
+      rake

     ffi-libarchive (1.1.3)
       ffi (~> 1.0)
     fspath (3.1.2)
     gd2-ffij (0.4.0)
       ffi (>= 1.0.0)
     ffi-libarchive (1.1.3)
       ffi (~> 1.0)
     fspath (3.1.2)
     gd2-ffij (0.4.0)
       ffi (>= 1.0.0)

-    globalid (0.5.2)
+    globalid (1.0.0)

       activesupport (>= 5.0)
     hashdiff (1.0.1)
       activesupport (>= 5.0)
     hashdiff (1.0.1)

-    hashie (4.1.0)
+    hashie (5.0.0)

     html_tokenizer (0.0.7)
     htmlentities (4.3.4)
     http_accept_language (2.1.1)
     html_tokenizer (0.0.7)
     htmlentities (4.3.4)
     http_accept_language (2.1.1)

-    i18n (1.8.10)
+    i18n (1.8.11)

       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.30.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)


@@ -252,17 +260,17 @@ 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)
     in_threads (1.5.4)

-    jbuilder (2.11.2)
+    jbuilder (2.11.3)

       activesupport (>= 5.0.0)
     jmespath (1.4.0)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
       activesupport (>= 5.0.0)
     jmespath (1.4.0)
     jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)

-    json (2.5.1)
-    jwt (2.2.3)
+    json (2.6.1)
+    jwt (2.3.0)

     kgio (2.11.4)
     kramdown (2.3.1)
       rexml
     kgio (2.11.4)
     kramdown (2.3.1)
       rexml


@@ -279,10 +287,11 @@ 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)

-    mini_mime (1.1.1)
+    mini_mime (1.1.2)

     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)


@@ -309,7 +318,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)


@@ -325,7 +334,7 @@ GEM
     omniauth-oauth (1.2.0)
       oauth
       omniauth (>= 1.0, < 3)
     omniauth-oauth (1.2.0)
       oauth
       omniauth (>= 1.0, < 3)

-    omniauth-oauth2 (1.7.1)
+    omniauth-oauth2 (1.7.2)

       oauth2 (~> 1.4)
       omniauth (>= 1.9, < 3)
     omniauth-openid (2.0.1)
       oauth2 (~> 1.4)
       omniauth (>= 1.9, < 3)
     omniauth-openid (2.0.1)


@@ -339,17 +348,17 @@ GEM
       omniauth-oauth2 (~> 1.4)
     openstreetmap-deadlock_retry (1.3.1)
     parallel (1.21.0)
       omniauth-oauth2 (~> 1.4)
     openstreetmap-deadlock_retry (1.3.1)
     parallel (1.21.0)

-    parser (3.0.2.0)
+    parser (3.0.3.1)

       ast (~> 2.4.1)
     pg (1.2.3)
     popper_js (1.16.0)
     progress (3.6.0)
     public_suffix (4.0.6)
       ast (~> 2.4.1)
     pg (1.2.3)
     popper_js (1.16.0)
     progress (3.6.0)
     public_suffix (4.0.6)

-    puma (5.5.0)
+    puma (5.5.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)

-    racc (1.5.2)
+    racc (1.6.0)

     rack (2.2.3)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
     rack (2.2.3)
     rack-cors (1.1.1)
       rack (>= 2.0.0)


@@ -405,7 +414,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.0)
+    rubocop (1.23.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)


@@ -414,14 +423,14 @@ GEM
       rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
       rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)

-    rubocop-ast (1.12.0)
+    rubocop-ast (1.13.0)

       parser (>= 3.0.1.1)
       parser (>= 3.0.1.1)

-    rubocop-minitest (0.15.1)
+    rubocop-minitest (0.17.0)

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

-    rubocop-performance (1.11.5)
+    rubocop-performance (1.12.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.11.3)
+    rubocop-rails (2.12.4)

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


@@ -429,7 +438,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.3)
+    ruby-vips (2.1.4)

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


@@ -459,13 +468,13 @@ GEM
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)

-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+    sprockets-rails (3.4.1)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)

       sprockets (>= 3.0.0)
     strong_migrations (0.7.8)
       activerecord (>= 5)
       sprockets (>= 3.0.0)
     strong_migrations (0.7.8)
       activerecord (>= 5)

-    terser (1.1.7)
+    terser (1.1.8)

       execjs (>= 0.3.0, < 3)
     thor (1.1.0)
     tilt (2.0.10)
       execjs (>= 0.3.0, < 3)
     thor (1.1.0)
     tilt (2.0.10)


@@ -484,7 +493,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


@@ -495,6 +504,7 @@ DEPENDENCIES
   active_record_union
   activerecord-import
   annotate
   active_record_union
   activerecord-import
   annotate

+  argon2

   autoprefixer-rails
   aws-sdk-s3
   better_errors
   autoprefixer-rails
   aws-sdk-s3
   better_errors


@@ -508,8 +518,9 @@ DEPENDENCIES
   cancancan
   canonical-rails
   capybara (>= 2.15)
   cancancan
   canonical-rails
   capybara (>= 2.15)

-  composite_primary_keys (~> 13.0.0)
+  composite_primary_keys (~> 13.0.0, != 13.0.1)

   config
   config

+  connection_pool

   dalli
   debug_inspector
   delayed_job_active_record
   dalli
   debug_inspector
   delayed_job_active_record


@@ -560,12 +571,12 @@ DEPENDENCIES
   rubocop
   rubocop-minitest
   rubocop-performance
   rubocop
   rubocop-minitest
   rubocop-performance

-  rubocop-rails (~> 2.11.3)
+  rubocop-rails

   rubocop-rake
   sanitize
   sassc-rails
   secure_headers
   rubocop-rake
   sanitize
   sassc-rails
   secure_headers

-  selenium-webdriver
+  selenium-webdriver (~> 3.142.7)

   simplecov
   simplecov-lcov
   strong_migrations
   simplecov
   simplecov-lcov
   strong_migrations