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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 4a9e2e042f70a38edde473bfa0afe458660c153b..c9a6ee6b09f7eaea828c857d633e201a829acf6a 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,6 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    SystemTimer (1.2.3)
     aasm (5.1.1)
       concurrent-ruby (~> 1.0)
     actioncable (6.0.3.4)
@@ -74,7 +73,7 @@ GEM
     autoprefixer-rails (10.1.0.0)
       execjs
     aws-eventstream (1.1.0)
-    aws-partitions (1.410.0)
+    aws-partitions (1.414.0)
     aws-sdk-core (3.110.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
@@ -83,9 +82,9 @@ GEM
     aws-sdk-kms (1.40.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.86.2)
+    aws-sdk-s3 (1.87.0)
       aws-sdk-core (~> 3, >= 3.109.0)
-      aws-sdk-kms (~> 1.26)
+      aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.2.2)
       aws-eventstream (~> 1, >= 1.0.2)
@@ -102,7 +101,7 @@ GEM
       parser (>= 2.4)
       smart_properties
     bigdecimal (1.1.0)
-    binding_of_caller (0.8.0)
+    binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
     bootsnap (1.5.1)
       msgpack (~> 1.0)
@@ -113,12 +112,12 @@ GEM
     bootstrap_form (4.5.0)
       actionpack (>= 5.2)
       activemodel (>= 5.2)
-    brakeman (4.10.0)
+    brakeman (4.10.1)
     browser (5.2.0)
     builder (3.2.4)
     bzip2-ffi (1.0.0)
       ffi (~> 1.0)
-    cancancan (3.2.0)
+    cancancan (3.2.1)
     canonical-rails (0.2.11)
       rails (>= 4.1, < 6.2)
     capybara (3.34.0)
@@ -131,13 +130,14 @@ GEM
       xpath (~> 3.2)
     childprocess (3.0.0)
     coderay (1.1.3)
-    composite_primary_keys (12.0.3)
+    composite_primary_keys (12.0.5)
       activerecord (~> 6.0.0)
     concurrent-ruby (1.1.7)
     config (2.2.3)
       deep_merge (~> 1.2, >= 1.2.1)
       dry-validation (~> 1.0, >= 1.0.0)
-    crack (0.4.4)
+    crack (0.4.5)
+      rexml
     crass (1.0.6)
     dalli (2.7.11)
     debug_inspector (0.0.3)
@@ -147,11 +147,10 @@ GEM
     delayed_job_active_record (4.1.5)
       activerecord (>= 3.0, < 6.2)
       delayed_job (>= 3.0, < 5)
-    docile (1.3.3)
-    dry-configurable (0.11.6)
+    docile (1.3.4)
+    dry-configurable (0.12.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.7)
-      dry-equalizer (~> 0.2)
+      dry-core (~> 0.5, >= 0.5.0)
     dry-container (0.7.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
@@ -160,10 +159,9 @@ GEM
     dry-equalizer (0.3.0)
     dry-inflector (0.2.0)
     dry-initializer (3.0.4)
-    dry-logic (1.0.8)
+    dry-logic (1.1.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.2)
-      dry-equalizer (~> 0.2)
+      dry-core (~> 0.5, >= 0.5)
     dry-schema (1.5.6)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.8, >= 0.8.3)
@@ -203,10 +201,12 @@ GEM
     factory_bot_rails (6.1.0)
       factory_bot (~> 6.1.0)
       railties (>= 5.0.0)
-    faraday (1.1.0)
+    faraday (1.3.0)
+      faraday-net_http (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords
-    ffi (1.14.1)
+    faraday-net_http (1.0.0)
+    ffi (1.14.2)
     ffi-libarchive (1.0.4)
       ffi (~> 1.0)
     fspath (3.1.2)
@@ -242,19 +242,17 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.4.1)
+    json (2.5.1)
     jwt (2.2.2)
     kgio (2.11.3)
     kramdown (2.3.0)
       rexml
     libxml-ruby (3.2.1)
-    listen (3.3.3)
+    listen (3.4.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)
+    logstasher (2.1.5)
+      activesupport (>= 5.2)
       request_store
     loofah (2.8.0)
       crass (~> 1.0.2)
@@ -321,12 +319,12 @@ GEM
       omniauth-oauth2 (~> 1.4)
     openstreetmap-deadlock_retry (1.3.0)
     parallel (1.20.1)
-    parser (2.7.2.0)
+    parser (3.0.0.0)
       ast (~> 2.4.1)
     pg (1.2.3)
     popper_js (1.16.0)
     progress (3.5.2)
-    psych (3.2.1)
+    psych (3.3.0)
     public_suffix (4.0.6)
     puma (5.1.1)
       nio4r (~> 2.0)
@@ -396,9 +394,9 @@ GEM
       unicode-display_width (>= 1.4.0, < 2.0)
     rubocop-ast (1.3.0)
       parser (>= 2.7.1.5)
-    rubocop-minitest (0.10.1)
-      rubocop (>= 0.87)
-    rubocop-performance (1.9.1)
+    rubocop-minitest (0.10.2)
+      rubocop (>= 0.87, < 2.0)
+    rubocop-performance (1.9.2)
       rubocop (>= 0.90.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rails (2.9.1)
@@ -406,7 +404,7 @@ GEM
       rack (>= 1.1)
       rubocop (>= 0.90.0, < 2.0)
     ruby-openid (2.9.2)
-    ruby-progressbar (1.10.1)
+    ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.2)
     rubyzip (2.3.0)
     sanitize (5.2.1)
@@ -468,7 +466,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  SystemTimer (>= 1.1.3)
   aasm
   actionpack-page_caching (>= 1.2.0)
   active_record_union
@@ -491,6 +488,7 @@ DEPENDENCIES
   composite_primary_keys (~> 12.0.0)
   config
   dalli
+  debug_inspector (< 1.0.0)
   delayed_job_active_record
   dynamic_form
   erb_lint