From 6f8317b00704f8a05145f78816ae291043b5a64a Mon Sep 17 00:00:00 2001
From: Pau Perez <saulopefa@gmail.com>
Date: Mon, 14 May 2018 12:48:15 +0200
Subject: [PATCH] Upgrade spree to point to 1c3dfc7fb

This will fetch latest changes applied in the fork. It also changes the
Github organization we fetch it from. From now on we'll work there and
not in Coopdevs org.
---
 Gemfile      |  2 +-
 Gemfile.lock | 44 +++++++++++++++++++-------------------------
 2 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/Gemfile b/Gemfile
index 91d0d9ad8a..c587209866 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,7 +15,7 @@ gem 'pg'
 # 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', github: 'openfoodfoundation/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'
diff --git a/Gemfile.lock b/Gemfile.lock
index b274d0b720..eb41eed5b0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,8 +7,22 @@ GIT
       activemodel (~> 3.0)
 
 GIT
-  remote: https://github.com/coopdevs/spree.git
-  revision: 6c3d8841018de80f41c9400611de2e8a51923711
+  remote: https://github.com/jeremydurham/custom-err-msg.git
+  revision: 3a8ec9dddc7a5b0aab7c69a6060596de300c68f4
+  specs:
+    custom_error_message (1.1.1)
+
+GIT
+  remote: https://github.com/openfoodfoundation/ofn-qz.git
+  revision: 60da2ae4c44cbb4c8d602f59fb5fff8d0f21db3c
+  ref: 60da2ae4c44cbb4c8d602f59fb5fff8d0f21db3c
+  specs:
+    ofn-qz (0.1.0)
+      railties (~> 3.1)
+
+GIT
+  remote: https://github.com/openfoodfoundation/spree.git
+  revision: 1c3dfc7fb48cde32f7dc49a59c1daf65a3ee6974
   branch: 2-0-4-stable
   specs:
     spree (2.0.4)
@@ -63,20 +77,6 @@ GIT
     spree_sample (2.0.4)
       spree_core (= 2.0.4)
 
-GIT
-  remote: https://github.com/jeremydurham/custom-err-msg.git
-  revision: 3a8ec9dddc7a5b0aab7c69a6060596de300c68f4
-  specs:
-    custom_error_message (1.1.1)
-
-GIT
-  remote: https://github.com/openfoodfoundation/ofn-qz.git
-  revision: 60da2ae4c44cbb4c8d602f59fb5fff8d0f21db3c
-  ref: 60da2ae4c44cbb4c8d602f59fb5fff8d0f21db3c
-  specs:
-    ofn-qz (0.1.0)
-      railties (~> 3.1)
-
 GIT
   remote: https://github.com/spree-contrib/better_spree_paypal_express.git
   revision: 1206925d1c85bdc4b68b728d6676150ab0785486
@@ -137,16 +137,10 @@ GEM
       sprockets (~> 2.2.1)
     active_model_serializers (0.8.3)
       activemodel (>= 3.0)
-    active_utils (2.2.3)
-      activesupport (>= 2.3.11)
-      i18n
-    activemerchant (1.43.3)
-      active_utils (~> 2.0, >= 2.0.1)
-      activesupport (>= 2.3.14, < 5.0.0)
+    activemerchant (1.78.0)
+      activesupport (>= 3.2.14, < 6.x)
       builder (>= 2.1.2, < 4.0.0)
-      i18n (~> 0.5)
-      json (~> 1.7)
-      money (< 7.0.0)
+      i18n (>= 0.6.9)
       nokogiri (~> 1.4)
     activemodel (3.2.21)
       activesupport (= 3.2.21)