From 455a122ef0135bd133b51014467211bc9a0a11f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maurice=20Ku=CC=88hlborn?= <mk@minimalweb.de>
Date: Thu, 15 Nov 2018 12:11:36 +0100
Subject: Add progressive JPG to default variable content types

---
 activestorage/CHANGELOG.md                 | 4 ++++
 activestorage/lib/active_storage/engine.rb | 1 +
 2 files changed, 5 insertions(+)

(limited to 'activestorage')

diff --git a/activestorage/CHANGELOG.md b/activestorage/CHANGELOG.md
index f4e2826dc6..ba57315301 100644
--- a/activestorage/CHANGELOG.md
+++ b/activestorage/CHANGELOG.md
@@ -1,3 +1,7 @@
+*   Add progressive JPG to default list of variable content types
+
+    *Maurice Kühlborn*
+
 *   Add `ActiveStorage.routes_prefix` for configuring generated routes.
 
     *Chris Bisnett*
diff --git a/activestorage/lib/active_storage/engine.rb b/activestorage/lib/active_storage/engine.rb
index 7eb93b5e16..d51e806220 100644
--- a/activestorage/lib/active_storage/engine.rb
+++ b/activestorage/lib/active_storage/engine.rb
@@ -26,6 +26,7 @@ module ActiveStorage
       image/gif
       image/jpg
       image/jpeg
+      image/pjpeg
       image/vnd.adobe.photoshop
       image/vnd.microsoft.icon
     )
-- 
cgit v1.2.3