Merge remote-tracking branch 'openstreetmap/pull/1347' into master

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index a8c91f460cffcc1d140e492f806bd5c64541a473..1fade149c7bf3f241373929eb609449faaa41403 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -157,6 +157,7 @@ GEM
     mimemagic (0.3.0)
     mini_portile2 (2.1.0)
     minitest (5.10.1)
     mimemagic (0.3.0)
     mini_portile2 (2.1.0)
     minitest (5.10.1)

+    minitest-stub_any_instance (1.0.1)

     multi_json (1.12.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     multi_json (1.12.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)


@@ -354,6 +355,7 @@ DEPENDENCIES
   libxml-ruby (>= 2.0.5)
   logstasher
   minitest (~> 5.1)
   libxml-ruby (>= 2.0.5)
   logstasher
   minitest (~> 5.1)

+  minitest-stub_any_instance

   oauth-plugin (>= 0.5.1)
   omniauth
   omniauth-facebook
   oauth-plugin (>= 0.5.1)
   omniauth
   omniauth-facebook