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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 43a488aec975b4e411ebb4821431f42cc53c3ce0..a0d50c15a7e02c577bd2a1ddc6cdbe1eeedbbec8 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -200,7 +200,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 +208,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 +259,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,7 +316,7 @@ 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)
     poltergeist (1.18.1)
@@ -331,7 +331,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 +489,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 +501,7 @@ DEPENDENCIES
   libxml-ruby (>= 2.0.5)
   listen
   logstasher
+  maxminddb
   mimemagic
   mini_magick
   minitest (~> 5.1)