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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index a4104c53625bb0822be5448ec7c09b8b1c5db4f6..97473d9ac53b8f4e08e7d79fb260cd48b0782f31 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,7 +2,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)
   remote: https://rubygems.org/
   specs:
     SystemTimer (1.2.3)

-    aasm (5.0.5)
+    aasm (5.0.6)

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


@@ -40,7 +40,7 @@ GEM
       activemodel (= 5.2.3)
       activesupport (= 5.2.3)
       arel (>= 9.0)
       activemodel (= 5.2.3)
       activesupport (= 5.2.3)
       arel (>= 9.0)

-    activerecord-import (1.0.2)
+    activerecord-import (1.0.3)

       activerecord (>= 3.2)
     activestorage (5.2.3)
       actionpack (= 5.2.3)
       activerecord (>= 3.2)
     activestorage (5.2.3)
       actionpack (= 5.2.3)


@@ -51,9 +51,9 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)

-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
-    annotate (2.7.5)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    annotate (3.0.2)

       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 13.0)
     arel (9.0.0)
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 13.0)
     arel (9.0.0)


@@ -61,8 +61,8 @@ GEM
     autoprefixer-rails (8.6.5)
       execjs
     aws-eventstream (1.0.3)
     autoprefixer-rails (8.6.5)
       execjs
     aws-eventstream (1.0.3)

-    aws-partitions (1.206.0)
-    aws-sdk-core (3.64.0)
+    aws-partitions (1.226.0)
+    aws-sdk-core (3.69.1)

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


@@ -70,7 +70,7 @@ GEM
     aws-sdk-kms (1.24.0)
       aws-sdk-core (~> 3, >= 3.61.1)
       aws-sigv4 (~> 1.1)
     aws-sdk-kms (1.24.0)
       aws-sdk-core (~> 3, >= 3.61.1)
       aws-sigv4 (~> 1.1)

-    aws-sdk-s3 (1.46.0)
+    aws-sdk-s3 (1.50.0)

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


@@ -91,7 +91,7 @@ GEM
     bigdecimal (1.1.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     bigdecimal (1.1.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)

-    bootsnap (1.4.4)
+    bootsnap (1.4.5)

       msgpack (~> 1.0)
     browser (2.6.1)
     builder (3.2.3)
       msgpack (~> 1.0)
     browser (2.6.1)
     builder (3.2.3)


@@ -131,7 +131,7 @@ GEM
       tins (~> 1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
       tins (~> 1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)

-    crass (1.0.4)
+    crass (1.0.5)

     dalli (2.7.10)
     debug_inspector (0.0.3)
     deep_merge (1.2.1)
     dalli (2.7.10)
     debug_inspector (0.0.3)
     deep_merge (1.2.1)


@@ -150,21 +150,21 @@ GEM
     dry-core (0.4.9)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.2.2)
     dry-core (0.4.9)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.2.2)

-    dry-inflector (0.1.2)
+    dry-inflector (0.2.0)

     dry-initializer (3.0.1)
     dry-logic (1.0.3)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)
     dry-initializer (3.0.1)
     dry-logic (1.0.3)
       concurrent-ruby (~> 1.0)
       dry-core (~> 0.2)
       dry-equalizer (~> 0.2)

-    dry-schema (1.3.3)
+    dry-schema (1.4.1)

       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.8, >= 0.8.3)
       dry-core (~> 0.4)
       dry-equalizer (~> 0.2)
       dry-initializer (~> 3.0)
       dry-logic (~> 1.0)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.8, >= 0.8.3)
       dry-core (~> 0.4)
       dry-equalizer (~> 0.2)
       dry-initializer (~> 3.0)
       dry-logic (~> 1.0)

-      dry-types (~> 1.0)
-    dry-types (1.1.1)
+      dry-types (~> 1.2)
+    dry-types (1.2.0)

       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)


@@ -172,23 +172,23 @@ GEM
       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)

-    erb_lint (0.0.29)
+    erb_lint (0.0.30)

       activesupport
       better_html (~> 1.0.7)
       html_tokenizer
       rainbow
       rubocop (~> 0.51)
       smart_properties
       activesupport
       better_html (~> 1.0.7)
       html_tokenizer
       rainbow
       rubocop (~> 0.51)
       smart_properties

-    erubi (1.8.0)
+    erubi (1.9.0)

     execjs (2.7.0)
     exifr (1.3.6)
     execjs (2.7.0)
     exifr (1.3.6)

-    factory_bot (5.0.2)
+    factory_bot (5.1.1)

       activesupport (>= 4.2.0)
       activesupport (>= 4.2.0)

-    factory_bot_rails (5.0.2)
-      factory_bot (~> 5.0.2)
+    factory_bot_rails (5.1.1)
+      factory_bot (~> 5.1.0)

       railties (>= 4.2.0)
     fakefs (0.20.1)
       railties (>= 4.2.0)
     fakefs (0.20.1)

-    faraday (0.15.4)
+    faraday (0.17.0)

       multipart-post (>= 1.2, < 3)
     ffi (1.11.1)
     ffi-libarchive (0.4.10)
       multipart-post (>= 1.2, < 3)
     ffi (1.11.1)
     ffi-libarchive (0.4.10)


@@ -206,7 +206,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.3.0)
+    i18n-js (3.4.0)

       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)


@@ -236,16 +236,15 @@ GEM
     kgio (2.11.2)
     kramdown (2.1.0)
     libxml-ruby (3.1.0)
     kgio (2.11.2)
     kramdown (2.1.0)
     libxml-ruby (3.1.0)

-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
+    listen (3.2.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)

     logstash-event (1.2.02)
     logstasher (1.3.0)
       activesupport (>= 4.0)
       logstash-event (~> 1.2.0)
       request_store
     logstash-event (1.2.02)
     logstasher (1.3.0)
       activesupport (>= 4.0)
       logstash-event (~> 1.2.0)
       request_store

-    loofah (2.2.3)
+    loofah (2.3.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)


@@ -257,12 +256,12 @@ GEM
     mini_magick (4.9.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     mini_magick (4.9.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)

-    minitest (5.11.3)
+    minitest (5.12.2)

     msgpack (1.3.1)
     msgpack (1.3.1)

-    multi_json (1.13.1)
+    multi_json (1.14.1)

     multi_xml (0.6.0)
     multipart-post (2.1.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)

-    nio4r (2.4.0)
+    nio4r (2.5.2)

     nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     nokogumbo (2.0.1)
     nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     nokogumbo (2.0.1)


@@ -273,8 +272,8 @@ GEM
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack
       oauth (~> 0.4.4)
       oauth2 (>= 0.5.0)
       rack

-    oauth2 (1.4.1)
-      faraday (>= 0.8, < 0.16.0)
+    oauth2 (1.4.2)
+      faraday (>= 0.8, < 2.0)

       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)


@@ -307,8 +306,8 @@ GEM
       multi_json (~> 1.12)
       omniauth-oauth2 (~> 1.4)
     openstreetmap-deadlock_retry (1.3.0)
       multi_json (~> 1.12)
       omniauth-oauth2 (~> 1.4)
     openstreetmap-deadlock_retry (1.3.0)

-    parallel (1.17.0)
-    parser (2.6.3.0)
+    parallel (1.18.0)
+    parser (2.6.5.0)

       ast (~> 2.4.0)
     pg (1.1.4)
     poltergeist (1.18.1)
       ast (~> 2.4.0)
     pg (1.1.4)
     poltergeist (1.18.1)


@@ -317,7 +316,7 @@ GEM
       websocket-driver (>= 0.2.0)
     progress (3.5.2)
     psych (3.1.0)
       websocket-driver (>= 0.2.0)
     progress (3.5.2)
     psych (3.1.0)

-    public_suffix (3.1.1)
+    public_suffix (4.0.1)

     puma (3.12.1)
     quad_tile (1.0.1)
     r2 (0.2.7)
     puma (3.12.1)
     quad_tile (1.0.1)
     r2 (0.2.7)


@@ -349,8 +348,8 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)

-    rails-html-sanitizer (1.2.0)
-      loofah (~> 2.2, >= 2.2.2)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)

     rails-i18n (4.0.2)
       i18n (~> 0.6)
       rails (>= 4.0)
     rails-i18n (4.0.2)
       i18n (~> 0.6)
       rails (>= 4.0)


@@ -372,29 +371,27 @@ GEM
     rinku (2.0.6)
     rotp (5.1.0)
       addressable (~> 2.5)
     rinku (2.0.6)
     rotp (5.1.0)
       addressable (~> 2.5)

-    rubocop (0.74.0)
+    rubocop (0.75.1)

       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.4.1)
+    rubocop-performance (1.5.0)

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

-    rubocop-rails (2.3.1)
+    rubocop-rails (2.3.2)

       rack (>= 1.1)
       rubocop (>= 0.72.0)
       rack (>= 1.1)
       rubocop (>= 0.72.0)

-    ruby-openid (2.7.0)
+    ruby-openid (2.9.2)

     ruby-progressbar (1.10.1)
     ruby-progressbar (1.10.1)

-    ruby_dep (1.5.0)

     safe_yaml (1.0.5)
     safe_yaml (1.0.5)

-    sanitize (5.0.0)
+    sanitize (5.1.0)

       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
       nokogumbo (~> 2.0)

-    sassc (2.0.1)
+    sassc (2.2.1)

       ffi (~> 1.9)
       ffi (~> 1.9)

-      rake

     sassc-rails (2.1.2)
       railties (>= 4.0.0)
       sassc (>= 2.0)
     sassc-rails (2.1.2)
       railties (>= 4.0.0)
       sassc (>= 2.0)


@@ -408,7 +405,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     smart_properties (1.15.0)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     smart_properties (1.15.0)

-    sprockets (3.7.2)
+    sprockets (4.0.0)

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


@@ -421,17 +418,17 @@ GEM
       tins (~> 1.0)
     thor (0.20.3)
     thread_safe (0.3.6)
       tins (~> 1.0)
     thor (0.20.3)
     thread_safe (0.3.6)

-    tilt (2.0.9)
+    tilt (2.0.10)

     tins (1.21.1)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     tins (1.21.1)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)

-    uglifier (4.1.20)
+    uglifier (4.2.0)

       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.6.0)
     validates_email_format_of (1.6.3)
       i18n
     vendorer (0.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (1.6.0)
     validates_email_format_of (1.6.3)
       i18n
     vendorer (0.2.0)

-    webmock (3.6.2)
+    webmock (3.7.6)

       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)