From 526d6307935d749912a25bc3f2ed1e91cd469489 Mon Sep 17 00:00:00 2001
From: George Claghorn <george@hey.com>
Date: Fri, 26 Mar 2021 08:55:39 -0400
Subject: [PATCH] Upgrade to Marcel 1.0.0

---
 Gemfile.lock                        | 6 ++----
 activestorage/activestorage.gemspec | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 60c127fca9..5d725185d9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -74,7 +74,7 @@ PATH
       activejob (= 7.0.0.alpha)
       activerecord (= 7.0.0.alpha)
       activesupport (= 7.0.0.alpha)
-      marcel (~> 0.3.1)
+      marcel (~> 1.0.0)
       mini_mime (~> 1.0.2)
     activesupport (7.0.0.alpha)
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -315,11 +315,9 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    marcel (1.0.0)
     memoist (0.16.2)
     method_source (1.0.0)
-    mimemagic (0.3.5)
     mini_magick (4.11.0)
     mini_mime (1.0.2)
     mini_portile2 (2.5.0)
diff --git a/activestorage/activestorage.gemspec b/activestorage/activestorage.gemspec
index 28a55b9ba6..9133bb8709 100644
--- a/activestorage/activestorage.gemspec
+++ b/activestorage/activestorage.gemspec
@@ -36,6 +36,6 @@ Gem::Specification.new do |s|
   s.add_dependency "activejob",     version
   s.add_dependency "activerecord",  version
 
-  s.add_dependency "marcel",    "~> 0.3.1"
+  s.add_dependency "marcel",    "~> 1.0.0"
   s.add_dependency "mini_mime", "~> 1.0.2"
 end