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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index e9dd8af4b1443787d343840ce90d4d1b26050b34..43a488aec975b4e411ebb4821431f42cc53c3ce0 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,60 +4,62 @@ GEM
     SystemTimer (1.2.3)
     aasm (5.0.6)
       concurrent-ruby (~> 1.0)
     SystemTimer (1.2.3)
     aasm (5.0.6)
       concurrent-ruby (~> 1.0)

-    actioncable (6.0.1)
-      actionpack (= 6.0.1)
+    actioncable (6.0.2.1)
+      actionpack (= 6.0.2.1)

       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)

-    actionmailbox (6.0.1)
-      actionpack (= 6.0.1)
-      activejob (= 6.0.1)
-      activerecord (= 6.0.1)
-      activestorage (= 6.0.1)
-      activesupport (= 6.0.1)
+    actionmailbox (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)

       mail (>= 2.7.1)
       mail (>= 2.7.1)

-    actionmailer (6.0.1)
-      actionpack (= 6.0.1)
-      actionview (= 6.0.1)
-      activejob (= 6.0.1)
+    actionmailer (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      actionview (= 6.0.2.1)
+      activejob (= 6.0.2.1)

       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)

-    actionpack (6.0.1)
-      actionview (= 6.0.1)
-      activesupport (= 6.0.1)
-      rack (~> 2.0)
+    actionpack (6.0.2.1)
+      actionview (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      rack (~> 2.0, >= 2.0.8)

       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)

-    actiontext (6.0.1)
-      actionpack (= 6.0.1)
-      activerecord (= 6.0.1)
-      activestorage (= 6.0.1)
-      activesupport (= 6.0.1)
+    actionpack-page_caching (1.2.0)
+      actionpack (>= 5.0.0)
+    actiontext (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)

       nokogiri (>= 1.8.5)
       nokogiri (>= 1.8.5)

-    actionview (6.0.1)
-      activesupport (= 6.0.1)
+    actionview (6.0.2.1)
+      activesupport (= 6.0.2.1)

       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_record_union (1.3.0)
       activerecord (>= 4.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_record_union (1.3.0)
       activerecord (>= 4.0)

-    activejob (6.0.1)
-      activesupport (= 6.0.1)
+    activejob (6.0.2.1)
+      activesupport (= 6.0.2.1)

       globalid (>= 0.3.6)
       globalid (>= 0.3.6)

-    activemodel (6.0.1)
-      activesupport (= 6.0.1)
-    activerecord (6.0.1)
-      activemodel (= 6.0.1)
-      activesupport (= 6.0.1)
-    activerecord-import (1.0.3)
+    activemodel (6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord (6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord-import (1.0.4)

       activerecord (>= 3.2)
       activerecord (>= 3.2)

-    activestorage (6.0.1)
-      actionpack (= 6.0.1)
-      activejob (= 6.0.1)
-      activerecord (= 6.0.1)
+    activestorage (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activerecord (= 6.0.2.1)

       marcel (~> 0.3.1)
       marcel (~> 0.3.1)

-    activesupport (6.0.1)
+    activesupport (6.0.2.1)

       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)


@@ -69,20 +71,20 @@ GEM
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.0)
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.0)

-    autoprefixer-rails (8.6.5)
+    autoprefixer-rails (9.7.3)

       execjs
     aws-eventstream (1.0.3)
       execjs
     aws-eventstream (1.0.3)

-    aws-partitions (1.244.0)
-    aws-sdk-core (3.81.0)
+    aws-partitions (1.260.0)
+    aws-sdk-core (3.86.0)

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

-    aws-sdk-kms (1.25.0)
+    aws-sdk-kms (1.27.0)

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

-    aws-sdk-s3 (1.57.0)
-      aws-sdk-core (~> 3, >= 3.77.0)
+    aws-sdk-s3 (1.60.1)
+      aws-sdk-core (~> 3, >= 3.83.0)

       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.1.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.1.0)


@@ -104,14 +106,18 @@ GEM
       debug_inspector (>= 0.0.1)
     bootsnap (1.4.5)
       msgpack (~> 1.0)
       debug_inspector (>= 0.0.1)
     bootsnap (1.4.5)
       msgpack (~> 1.0)

-    browser (2.7.0)
-    builder (3.2.3)
+    bootstrap (4.3.1)
+      autoprefixer-rails (>= 9.1.0)
+      popper_js (>= 1.14.3, < 2)
+      sassc-rails (>= 2.0.0)
+    browser (2.7.1)
+    builder (3.2.4)

     bzip2-ffi (1.0.0)
       ffi (~> 1.0)
     cancancan (3.0.1)
     canonical-rails (0.2.6)
       rails (>= 4.1, < 6.1)
     bzip2-ffi (1.0.0)
       ffi (~> 1.0)
     cancancan (3.0.1)
     canonical-rails (0.2.6)
       rails (>= 4.1, < 6.1)

-    capybara (3.29.0)
+    capybara (3.30.0)

       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)


@@ -122,7 +128,7 @@ GEM
     childprocess (3.0.0)
     cliver (0.3.2)
     coderay (1.1.2)
     childprocess (3.0.0)
     cliver (0.3.2)
     coderay (1.1.2)

-    composite_primary_keys (12.0.0)
+    composite_primary_keys (12.0.1)

       activerecord (~> 6.0.0)
     concurrent-ruby (1.1.5)
     config (2.0.0)
       activerecord (~> 6.0.0)
     concurrent-ruby (1.1.5)
     config (2.0.0)


@@ -162,7 +168,7 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)

-    dry-schema (1.4.1)
+    dry-schema (1.4.2)

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


@@ -170,11 +176,11 @@ GEM
       dry-initializer (~> 3.0)
       dry-logic (~> 1.0)
       dry-types (~> 1.2)
       dry-initializer (~> 3.0)
       dry-logic (~> 1.0)
       dry-types (~> 1.2)

-    dry-types (1.2.1)
+    dry-types (1.2.2)

       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
       dry-core (~> 0.4, >= 0.4.4)
       concurrent-ruby (~> 1.0)
       dry-container (~> 0.3)
       dry-core (~> 0.4, >= 0.4.4)

-      dry-equalizer (~> 0.2, >= 0.2.2)
+      dry-equalizer (~> 0.3)

       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
     dynamic_form (1.1.4)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
     dynamic_form (1.1.4)


@@ -194,10 +200,10 @@ GEM
       factory_bot (~> 5.1.0)
       railties (>= 4.2.0)
     fakefs (0.20.1)
       factory_bot (~> 5.1.0)
       railties (>= 4.2.0)
     fakefs (0.20.1)

-    faraday (0.17.0)
+    faraday (0.17.1)

       multipart-post (>= 1.2, < 3)
       multipart-post (>= 1.2, < 3)

-    ffi (1.11.2)
-    ffi-libarchive (0.4.10)
+    ffi (1.11.3)
+    ffi-libarchive (1.0.0)

       ffi (~> 1.0)
     fspath (3.1.2)
     gd2-ffij (0.4.0)
       ffi (~> 1.0)
     fspath (3.1.2)
     gd2-ffij (0.4.0)


@@ -212,7 +218,7 @@ GEM
     http_accept_language (2.0.5)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     http_accept_language (2.0.5)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)

-    i18n-js (3.5.0)
+    i18n-js (3.5.1)

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


@@ -225,7 +231,7 @@ GEM
       rails
       sprockets
     image_size (2.0.2)
       rails
       sprockets
     image_size (2.0.2)

-    in_threads (1.5.3)
+    in_threads (1.5.4)

     jaro_winkler (1.5.4)
     jbuilder (2.9.1)
       activesupport (>= 4.2.0)
     jaro_winkler (1.5.4)
     jbuilder (2.9.1)
       activesupport (>= 4.2.0)


@@ -234,12 +240,12 @@ 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.2.0)
+    json (2.3.0)

     jwt (2.2.1)
     kgio (2.11.2)
     kramdown (2.1.0)
     libxml-ruby (3.1.0)
     jwt (2.2.1)
     kgio (2.11.2)
     kramdown (2.1.0)
     libxml-ruby (3.1.0)

-    listen (3.2.0)
+    listen (3.2.1)

       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logstash-event (1.2.02)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logstash-event (1.2.02)


@@ -247,7 +253,7 @@ GEM
       activesupport (>= 4.0)
       logstash-event (~> 1.2.0)
       request_store
       activesupport (>= 4.0)
       logstash-event (~> 1.2.0)
       request_store

-    loofah (2.3.1)
+    loofah (2.4.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)


@@ -265,7 +271,7 @@ GEM
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     nio4r (2.5.2)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     nio4r (2.5.2)

-    nokogiri (1.10.5)
+    nokogiri (1.10.7)

       mini_portile2 (~> 2.4.0)
     nokogumbo (2.0.2)
       nokogiri (~> 1.8, >= 1.8.4)
       mini_portile2 (~> 2.4.0)
     nokogumbo (2.0.2)
       nokogiri (~> 1.8, >= 1.8.4)


@@ -308,24 +314,23 @@ GEM
     omniauth-windowslive (0.0.12)
       multi_json (~> 1.12)
       omniauth-oauth2 (~> 1.4)
     omniauth-windowslive (0.0.12)
       multi_json (~> 1.12)
       omniauth-oauth2 (~> 1.4)

-    openstreetmap-actionpack-page_caching (1.1.2)
-      actionpack (>= 5.0.0)

     openstreetmap-deadlock_retry (1.3.0)
     parallel (1.19.1)
     openstreetmap-deadlock_retry (1.3.0)
     parallel (1.19.1)

-    parser (2.6.5.0)
+    parser (2.7.0.0)

       ast (~> 2.4.0)
       ast (~> 2.4.0)

-    pg (1.1.4)
+    pg (1.2.0)

     poltergeist (1.18.1)
       capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
     poltergeist (1.18.1)
       capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)

+    popper_js (1.14.5)

     progress (3.5.2)
     psych (3.1.0)
     progress (3.5.2)
     psych (3.1.0)

-    public_suffix (4.0.1)
-    puma (3.12.1)
+    public_suffix (4.0.2)
+    puma (3.12.2)

     quad_tile (1.0.1)
     r2 (0.2.7)
     quad_tile (1.0.1)
     r2 (0.2.7)

-    rack (2.0.7)
+    rack (2.0.8)

     rack-cors (1.1.0)
       rack (>= 2.0.0)
     rack-openid (1.3.1)
     rack-cors (1.1.0)
       rack (>= 2.0.0)
     rack-openid (1.3.1)


@@ -334,20 +339,20 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rack-uri_sanitizer (0.0.2)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rack-uri_sanitizer (0.0.2)

-    rails (6.0.1)
-      actioncable (= 6.0.1)
-      actionmailbox (= 6.0.1)
-      actionmailer (= 6.0.1)
-      actionpack (= 6.0.1)
-      actiontext (= 6.0.1)
-      actionview (= 6.0.1)
-      activejob (= 6.0.1)
-      activemodel (= 6.0.1)
-      activerecord (= 6.0.1)
-      activestorage (= 6.0.1)
-      activesupport (= 6.0.1)
+    rails (6.0.2.1)
+      actioncable (= 6.0.2.1)
+      actionmailbox (= 6.0.2.1)
+      actionmailer (= 6.0.2.1)
+      actionpack (= 6.0.2.1)
+      actiontext (= 6.0.2.1)
+      actionview (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)

       bundler (>= 1.3.0)
       bundler (>= 1.3.0)

-      railties (= 6.0.1)
+      railties (= 6.0.2.1)

       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.4)
       actionpack (>= 5.0.1.x)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.4)
       actionpack (>= 5.0.1.x)


@@ -361,33 +366,33 @@ GEM
     rails-i18n (4.0.2)
       i18n (~> 0.6)
       rails (>= 4.0)
     rails-i18n (4.0.2)
       i18n (~> 0.6)
       rails (>= 4.0)

-    railties (6.0.1)
-      actionpack (= 6.0.1)
-      activesupport (= 6.0.1)
+    railties (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activesupport (= 6.0.2.1)

       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
     rake (13.0.1)
     rb-fsevent (0.10.3)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
     rake (13.0.1)
     rb-fsevent (0.10.3)

-    rb-inotify (0.10.0)
+    rb-inotify (0.10.1)

       ffi (~> 1.0)
     regexp_parser (1.6.0)
       ffi (~> 1.0)
     regexp_parser (1.6.0)

-    request_store (1.4.1)
+    request_store (1.5.0)

       rack (>= 1.4)
     rinku (2.0.6)
     rotp (5.1.0)
       addressable (~> 2.5)
       rack (>= 1.4)
     rinku (2.0.6)
     rotp (5.1.0)
       addressable (~> 2.5)

-    rubocop (0.76.0)
+    rubocop (0.78.0)

       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)

-    rubocop-performance (1.5.1)
+    rubocop-performance (1.5.2)

       rubocop (>= 0.71.0)
       rubocop (>= 0.71.0)

-    rubocop-rails (2.3.2)
+    rubocop-rails (2.4.1)

       rack (>= 1.1)
       rubocop (>= 0.72.0)
     ruby-openid (2.9.2)
       rack (>= 1.1)
       rubocop (>= 0.72.0)
     ruby-openid (2.9.2)


@@ -407,7 +412,7 @@ GEM
       sprockets-rails
       tilt
     secure_headers (6.1.1)
       sprockets-rails
       tilt
     secure_headers (6.1.1)

-    selenium-webdriver (3.142.6)
+    selenium-webdriver (3.142.7)

       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
     simplecov (0.16.1)
       childprocess (>= 0.5, < 4.0)
       rubyzip (>= 1.2.2)
     simplecov (0.16.1)


@@ -423,15 +428,15 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)

-    strong_migrations (0.4.2)
+    strong_migrations (0.5.1)

       activerecord (>= 5)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
       activerecord (>= 5)
     term-ansicolor (1.7.1)
       tins (~> 1.0)

-    thor (0.20.3)
+    thor (1.0.1)

     thread_safe (0.3.6)
     tilt (2.0.10)
     tins (1.22.2)
     thread_safe (0.3.6)
     tilt (2.0.10)
     tins (1.22.2)

-    tzinfo (1.2.5)
+    tzinfo (1.2.6)

       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)


@@ -448,7 +453,7 @@ GEM
     websocket-extensions (0.1.4)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     websocket-extensions (0.1.4)
     xpath (3.2.0)
       nokogiri (~> 1.8)

-    zeitwerk (2.2.1)
+    zeitwerk (2.2.2)

 
 PLATFORMS
   ruby
 
 PLATFORMS
   ruby


@@ -456,15 +461,17 @@ PLATFORMS
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
   aasm
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
   aasm

+  actionpack-page_caching (>= 1.2.0)

   active_record_union
   activerecord-import
   annotate
   active_record_union
   activerecord-import
   annotate

-  autoprefixer-rails (~> 8.6.3)
+  autoprefixer-rails

   aws-sdk-s3
   better_errors
   bigdecimal (~> 1.1.0)
   binding_of_caller
   bootsnap (>= 1.4.2)
   aws-sdk-s3
   better_errors
   bigdecimal (~> 1.1.0)
   binding_of_caller
   bootsnap (>= 1.4.2)

+  bootstrap (~> 4.3.1)

   browser
   bzip2-ffi
   cancancan
   browser
   bzip2-ffi
   cancancan


@@ -506,7 +513,6 @@ DEPENDENCIES
   omniauth-mediawiki (>= 0.0.4)
   omniauth-openid
   omniauth-windowslive
   omniauth-mediawiki (>= 0.0.4)
   omniauth-openid
   omniauth-windowslive

-  openstreetmap-actionpack-page_caching (>= 1.1.2)

   openstreetmap-deadlock_retry (>= 1.3.0)
   pg
   poltergeist
   openstreetmap-deadlock_retry (>= 1.3.0)
   pg
   poltergeist


@@ -516,7 +522,7 @@ DEPENDENCIES
   r2 (~> 0.2.7)
   rack-cors
   rack-uri_sanitizer
   r2 (~> 0.2.7)
   rack-cors
   rack-uri_sanitizer

-  rails (= 6.0.1)
+  rails (= 6.0.2.1)

   rails-controller-testing
   rails-i18n (~> 4.0.0)
   rinku (>= 2.0.6)
   rails-controller-testing
   rails-i18n (~> 4.0.0)
   rinku (>= 2.0.6)