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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index c7f8126c437bff6700fdc547705070720ec683ce..8bcc99a765c562dddc31794cd8968d29b9b310fa 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -259,9 +259,6 @@ GEM
     marcel (1.0.0)
     maxminddb (0.1.22)
     method_source (1.0.0)
-    mimemagic (0.4.3)
-      nokogiri (~> 1)
-      rake
     mini_magick (4.11.0)
     mini_mime (1.0.3)
     mini_portile2 (2.5.0)
@@ -512,8 +509,8 @@ DEPENDENCIES
   libxml-ruby (>= 2.0.5)
   listen
   logstasher
+  marcel
   maxminddb
-  mimemagic
   mini_magick
   minitest (~> 5.1)
   oauth-plugin (>= 0.5.1)