Use OFN's Spree fork of 2.0.4 to get fixes

Gemfile

@@ -11,7 +11,12 @@ gem 'i18n-js', '~> 3.0.0'
 gem 'nokogiri', '>= 1.6.7.1'
 
 gem 'pg'
-gem 'spree', '2.0.4'
+
+# OFN-maintained and patched version of Spree v2.0.4. See
+# https://github.com/openfoodfoundation/openfoodnetwork/wiki/Spree-2.0-upgrade
+# for details.
+gem 'spree', github: 'coopdevs/spree', branch: '2-0-4-stable'
+
 gem 'spree_i18n', github: 'spree/spree_i18n', branch: '1-3-stable'
 gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-0-stable'
 

Gemfile.lock

@@ -6,6 +6,63 @@ GIT
       actionpack (~> 3.0)
       activemodel (~> 3.0)
 
+GIT
+  remote: https://github.com/coopdevs/spree.git
+  revision: 6c3d8841018de80f41c9400611de2e8a51923711
+  branch: 2-0-4-stable
+  specs:
+    spree (2.0.4)
+      spree_api (= 2.0.4)
+      spree_backend (= 2.0.4)
+      spree_cmd (= 2.0.4)
+      spree_core (= 2.0.4)
+      spree_frontend (= 2.0.4)
+      spree_sample (= 2.0.4)
+    spree_api (2.0.4)
+      rabl (= 0.8.4)
+      spree_core (= 2.0.4)
+      versioncake (= 1.0.0)
+    spree_backend (2.0.4)
+      deface (>= 0.9.0)
+      jquery-rails (~> 3.0.0)
+      jquery-ui-rails (~> 4.0.0)
+      rails (~> 3.2.8)
+      select2-rails (~> 3.4.7)
+      spree_api (= 2.0.4)
+      spree_core (= 2.0.4)
+    spree_cmd (2.0.4)
+      thor (>= 0.14.6)
+    spree_core (2.0.4)
+      activemerchant (~> 1.34)
+      acts_as_list (= 0.2.0)
+      awesome_nested_set (= 2.1.5)
+      aws-sdk (~> 1.3.4)
+      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.4.1)
+      paranoia (~> 1.3)
+      rails (~> 3.2.14)
+      ransack (= 0.7.2)
+      state_machine (= 1.2.0)
+      stringex (~> 1.5.1)
+      truncate_html (= 0.9.2)
+    spree_frontend (2.0.4)
+      canonical-rails
+      deface (>= 0.9.0)
+      jquery-rails (~> 3.0.0)
+      rails (~> 3.2.13)
+      spree_api (= 2.0.4)
+      spree_core (= 2.0.4)
+      stringex (~> 1.5.1)
+    spree_sample (2.0.4)
+      spree_core (= 2.0.4)
+
 GIT
   remote: https://github.com/jeremydurham/custom-err-msg.git
   revision: 3a8ec9dddc7a5b0aab7c69a6060596de300c68f4
@@ -589,57 +646,6 @@ GEM
       activesupport (>= 3.0.0)
     spinjs-rails (1.3)
       rails (>= 3.1)
-    spree (2.0.4)
-      spree_api (= 2.0.4)
-      spree_backend (= 2.0.4)
-      spree_cmd (= 2.0.4)
-      spree_core (= 2.0.4)
-      spree_frontend (= 2.0.4)
-      spree_sample (= 2.0.4)
-    spree_api (2.0.4)
-      rabl (= 0.8.4)
-      spree_core (= 2.0.4)
-      versioncake (= 1.0.0)
-    spree_backend (2.0.4)
-      deface (>= 0.9.0)
-      jquery-rails (~> 3.0.0)
-      jquery-ui-rails (~> 4.0.0)
-      rails (~> 3.2.8)
-      select2-rails (~> 3.4.7)
-      spree_api (= 2.0.4)
-      spree_core (= 2.0.4)
-    spree_cmd (2.0.4)
-      thor (>= 0.14.6)
-    spree_core (2.0.4)
-      activemerchant (~> 1.34)
-      acts_as_list (= 0.2.0)
-      awesome_nested_set (= 2.1.5)
-      aws-sdk (~> 1.3.4)
-      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.4.1)
-      paranoia (~> 1.3)
-      rails (~> 3.2.14)
-      ransack (= 0.7.2)
-      state_machine (= 1.2.0)
-      stringex (~> 1.5.1)
-      truncate_html (= 0.9.2)
-    spree_frontend (2.0.4)
-      canonical-rails
-      deface (>= 0.9.0)
-      jquery-rails (~> 3.0.0)
-      rails (~> 3.2.13)
-      spree_api (= 2.0.4)
-      spree_core (= 2.0.4)
-      stringex (~> 1.5.1)
-    spree_sample (2.0.4)
-      spree_core (= 2.0.4)
     sprockets (2.2.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -781,7 +787,7 @@ DEPENDENCIES
   simple_form!
   skylight (< 2.0)
   spinjs-rails
-  spree (= 2.0.4)
+  spree!
   spree_auth_devise!
   spree_i18n!
   spree_paypal_express!