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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 43a488aec975b4e411ebb4821431f42cc53c3ce0..997a7df09cc4ed54dbdaf84c3e2ad71a417f31f8 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -74,7 +74,7 @@ GEM
     autoprefixer-rails (9.7.3)
       execjs
     aws-eventstream (1.0.3)
-    aws-partitions (1.260.0)
+    aws-partitions (1.261.0)
     aws-sdk-core (3.86.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
@@ -110,7 +110,7 @@ GEM
       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 1.14.3, < 2)
       sassc-rails (>= 2.0.0)
-    browser (2.7.1)
+    browser (3.0.0)
     builder (3.2.4)
     bzip2-ffi (1.0.0)
       ffi (~> 1.0)
@@ -131,10 +131,9 @@ GEM
     composite_primary_keys (12.0.1)
       activerecord (~> 6.0.0)
     concurrent-ruby (1.1.5)
-    config (2.0.0)
-      activesupport (>= 4.2)
+    config (2.1.0)
       deep_merge (~> 1.2, >= 1.2.1)
-      dry-schema (~> 1.0)
+      dry-validation (~> 1.0)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -183,6 +182,13 @@ GEM
       dry-equalizer (~> 0.3)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
+    dry-validation (1.4.0)
+      concurrent-ruby (~> 1.0)
+      dry-container (~> 0.7, >= 0.7.1)
+      dry-core (~> 0.4)
+      dry-equalizer (~> 0.2)
+      dry-initializer (~> 3.0)
+      dry-schema (~> 1.0, >= 1.3.1)
     dynamic_form (1.1.4)
     erb_lint (0.0.30)
       activesupport
@@ -200,7 +206,7 @@ GEM
       factory_bot (~> 5.1.0)
       railties (>= 4.2.0)
     fakefs (0.20.1)
-    faraday (0.17.1)
+    faraday (1.0.0)
       multipart-post (>= 1.2, < 3)
     ffi (1.11.3)
     ffi-libarchive (1.0.0)
@@ -208,7 +214,6 @@ GEM
     fspath (3.1.2)
     gd2-ffij (0.4.0)
       ffi (>= 1.0.0)
-    geoip (1.6.4)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     hashdiff (1.0.0)
@@ -260,6 +265,7 @@ GEM
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
+    maxminddb (0.1.22)
     method_source (0.9.2)
     mimemagic (0.3.3)
     mini_magick (4.9.5)
@@ -316,9 +322,9 @@ GEM
       omniauth-oauth2 (~> 1.4)
     openstreetmap-deadlock_retry (1.3.0)
     parallel (1.19.1)
-    parser (2.7.0.0)
+    parser (2.7.0.1)
       ast (~> 2.4.0)
-    pg (1.2.0)
+    pg (1.2.1)
     poltergeist (1.18.1)
       capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
@@ -331,7 +337,7 @@ GEM
     quad_tile (1.0.1)
     r2 (0.2.7)
     rack (2.0.8)
-    rack-cors (1.1.0)
+    rack-cors (1.1.1)
       rack (>= 2.0.0)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
@@ -489,7 +495,6 @@ DEPENDENCIES
   faraday
   ffi-libarchive
   gd2-ffij (>= 0.4.0)
-  geoip
   htmlentities
   http_accept_language (~> 2.0.0)
   i18n-js (>= 3.0.0)
@@ -502,6 +507,7 @@ DEPENDENCIES
   libxml-ruby (>= 2.0.5)
   listen
   logstasher
+  maxminddb
   mimemagic
   mini_magick
   minitest (~> 5.1)