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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index de5157c0489f70b845895d3663b1eb1f0bd8d306..4798189389fd0e70d89c2011ad14788e2c14c9df 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -178,7 +178,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     ffi (1.11.1)
     fspath (3.1.1)
       multipart-post (>= 1.2, < 3)
     ffi (1.11.1)
     fspath (3.1.1)

-    gd2-ffij (0.3.0)
+    gd2-ffij (0.4.0)

       ffi (>= 1.0.0)
     geoip (1.6.4)
     globalid (0.4.2)
       ffi (>= 1.0.0)
     geoip (1.6.4)
     globalid (0.4.2)


@@ -471,7 +471,7 @@ DEPENDENCIES
   factory_bot_rails
   fakefs
   faraday
   factory_bot_rails
   fakefs
   faraday

-  gd2-ffij
+  gd2-ffij (>= 0.4.0)

   geoip
   htmlentities
   http_accept_language (~> 2.0.0)
   geoip
   htmlentities
   http_accept_language (~> 2.0.0)