From e3de71668af044c9466e7c401da24747cb8a009b Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Tue, 7 Apr 2020 13:15:48 +0100
Subject: [PATCH] Depend on a spree version in which spree_core doesnt depend
 on deface AND remove deface from list of dependencies

---
 Gemfile      |  1 -
 Gemfile.lock | 14 +++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/Gemfile b/Gemfile
index b01600d0d3..30def03b30 100644
--- a/Gemfile
+++ b/Gemfile
@@ -70,7 +70,6 @@ gem 'angularjs-file-upload-rails', '~> 2.4.1'
 gem 'blockenspiel'
 gem 'custom_error_message', github: 'jeremydurham/custom-err-msg'
 gem 'dalli'
-gem 'deface', '1.0.2'
 gem 'diffy'
 gem 'figaro'
 gem 'geocoder'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1cf17a8cd4..9698de0377 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -23,7 +23,7 @@ GIT
 
 GIT
   remote: https://github.com/openfoodfoundation/spree.git
-  revision: 8a8585a43cd04d1a50dc65227f337a91b18d66d5
+  revision: e10ca1f689b1658040b081939b7523f6fb68895a
   branch: 2-0-4-stable
   specs:
     spree_core (2.0.4)
@@ -32,14 +32,13 @@ GIT
       awesome_nested_set (= 2.1.5)
       aws-sdk (~> 1.11.1)
       cancan (~> 1.6.10)
-      deface (>= 0.9.1)
       ffaker (~> 1.16)
       highline (= 1.6.18)
       httparty (~> 0.11)
       json (>= 1.7.7)
       kaminari (~> 0.14.1)
       money (= 5.1.1)
-      paperclip (~> 3.0)
+      paperclip (~> 3.4.1)
       paranoia (~> 1.3)
       rails (~> 3.2.14)
       ransack (= 0.7.2)
@@ -167,7 +166,6 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
-    colorize (0.8.1)
     combine_pdf (1.0.16)
       ruby-rc4 (>= 0.1.5)
     compass (1.0.3)
@@ -201,11 +199,6 @@ GEM
     ddtrace (0.34.1)
       msgpack
     debugger-linecache (1.2.0)
-    deface (1.0.2)
-      colorize (>= 0.5.8)
-      nokogiri (~> 1.6.0)
-      polyglot
-      rails (>= 3.1)
     delayed_job (4.1.8)
       activesupport (>= 3.0, < 6.1)
     delayed_job_active_record (4.1.4)
@@ -238,7 +231,7 @@ GEM
       railties (>= 3.0.0)
     faraday (1.0.0)
       multipart-post (>= 1.2, < 3)
-    ffaker (1.22.1)
+    ffaker (1.32.1)
     ffi (1.12.2)
     figaro (1.1.1)
       thor (~> 0.14)
@@ -715,7 +708,6 @@ DEPENDENCIES
   db2fog
   ddtrace
   debugger-linecache
-  deface (= 1.0.2)
   delayed_job_active_record
   delayed_job_web
   devise (~> 2.2.5)