From ad20f598974ccfc48d89b4a46d6093c057a2108f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Mon, 7 Aug 2017 10:32:35 +0200
Subject: [PATCH] FIX: couldn't upload SVG with a DOCTYPE

---
 Gemfile      | 17 ++++++++---------
 Gemfile.lock |  4 ++--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index 14d91f50ed5..f4a4b165876 100644
--- a/Gemfile
+++ b/Gemfile
@@ -61,15 +61,16 @@ gem 'fast_xs'
 
 gem 'fast_xor'
 
-gem 'fastimage', '2.1.0'
+# Forked until https://github.com/sdsykes/fastimage/pull/93 is merged
+gem 'discourse_fastimage', require: 'fastimage'
+
 gem 'aws-sdk', require: false
 gem 'excon', require: false
 gem 'unf', require: false
 
 gem 'email_reply_trimmer', '0.1.7'
 
-# TODO Use official image_optim gem once https://github.com/toy/image_optim/pull/149
-# is merged.
+# Forked until https://github.com/toy/image_optim/pull/149 is merged
 gem 'discourse_image_optim', require: 'image_optim'
 gem 'multi_json'
 gem 'mustache'
@@ -85,7 +86,7 @@ gem 'omniauth-facebook'
 gem 'omniauth-twitter'
 gem 'omniauth-instagram'
 
-# forked while https://github.com/intridea/omniauth-github/pull/41 is being upstreamd
+# Forked until https://github.com/intridea/omniauth-github/pull/41 is merged
 gem 'omniauth-github-discourse', require: 'omniauth-github'
 
 gem 'omniauth-oauth2', require: false
@@ -110,9 +111,8 @@ gem 'mini_racer'
 gem 'highline', require: false
 gem 'rack-protection' # security
 
-# Gems used only for assets and not required
-# in production environments by default.
-# allow everywhere for now cause we are allowing asset debugging in prd
+# Gems used only for assets and not required in production environments by default.
+# Allow everywhere for now cause we are allowing asset debugging in production
 group :assets do
   gem 'uglifier'
   gem 'rtlit', require: false # for css rtling
@@ -157,7 +157,7 @@ end
 # this is an optional gem, it provides a high performance replacement
 # to String#blank? a method that is called quite frequently in current
 # ActiveRecord, this may change in the future
-gem 'fast_blank' #, github: "SamSaffron/fast_blank"
+gem 'fast_blank'
 
 # this provides a very efficient lru cache
 gem 'lru_redux'
@@ -177,7 +177,6 @@ gem 'rbtrace', require: false, platform: :mri
 gem 'gc_tracer', require: false, platform: :mri
 
 # required for feed importing and embedding
-#
 gem 'ruby-readability', require: false
 gem 'simple-rss', require: false
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 9ab168ba669..02deaddef9f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -79,6 +79,7 @@ GEM
     diff-lcs (1.3)
     discourse-qunit-rails (0.0.9)
       railties
+    discourse_fastimage (2.1.0)
     discourse_image_optim (0.24.5)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
@@ -112,7 +113,6 @@ GEM
       rake
       rake-compiler
     fast_xs (0.8.0)
-    fastimage (2.1.0)
     ffi (1.9.18)
     flamegraph (0.9.5)
     foreman (0.84.0)
@@ -413,6 +413,7 @@ DEPENDENCIES
   certified
   cppjieba_rb
   discourse-qunit-rails
+  discourse_fastimage
   discourse_image_optim
   email_reply_trimmer (= 0.1.7)
   ember-handlebars-template (= 0.7.5)
@@ -425,7 +426,6 @@ DEPENDENCIES
   fast_blank
   fast_xor
   fast_xs
-  fastimage (= 2.1.0)
   flamegraph
   foreman
   gc_tracer