From 8a42b606eb61b3c08235fcabdff84865afab101b Mon Sep 17 00:00:00 2001
From: Em-AK <emilien.ak@gmail.com>
Date: Thu, 6 Apr 2017 10:48:03 +0200
Subject: [PATCH] Start spree upgrade step 4

---
 Gemfile      |  2 +-
 Gemfile.lock | 74 ++++++++++++++++++++++++++--------------------------
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9d951f292b..0aa2a2fbe9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,7 +10,7 @@ gem 'i18n-js', '~> 3.0.0'
 gem 'nokogiri', '>= 1.6.7.1'
 
 gem 'pg'
-gem 'spree', github: 'openfoodfoundation/spree', branch: 'spree-upgrade-step-3'
+gem 'spree', github: 'coopdevs/spree', branch: 'spree-upgrade-step-4'
 gem 'spree_i18n', github: 'spree/spree_i18n', branch: '1-3-stable'
 gem 'spree_auth_devise', github: 'openfoodfoundation/spree_auth_devise', branch: 'spree-upgrade-intermediate'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index f9181e6a0a..674487c6c7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,31 +7,9 @@ GIT
       activemodel (~> 3.0)
 
 GIT
-  remote: git://github.com/jeremydurham/custom-err-msg.git
-  revision: 3a8ec9dddc7a5b0aab7c69a6060596de300c68f4
-  specs:
-    custom_error_message (1.1.1)
-
-GIT
-  remote: git://github.com/openfoodfoundation/better_spree_paypal_express.git
-  revision: 8d95f4544c682634812becaf50999fba0cd04df0
-  branch: spree-upgrade-intermediate
-  specs:
-    spree_paypal_express (2.0.3)
-      paypal-sdk-merchant (= 1.106.1)
-      spree_core (~> 1.3.99)
-
-GIT
-  remote: git://github.com/openfoodfoundation/ofn-qz.git
-  revision: 024680ccea429b2e5428d7b964fa67c52add34ec
-  specs:
-    ofn-qz (0.1.0)
-      railties (~> 3.1)
-
-GIT
-  remote: git://github.com/openfoodfoundation/spree.git
-  revision: 20915c4dc9738392a236265f2e571b709e2d1c9f
-  branch: spree-upgrade-step-3
+  remote: git://github.com/coopdevs/spree.git
+  revision: f60e40a5f148f669dedd63e17812290d38b45a48
+  branch: spree-upgrade-step-4
   specs:
     spree (1.3.99)
       spree_api (= 1.3.99)
@@ -59,17 +37,17 @@ GIT
       actionmailer (~> 3.2.9)
       activemerchant (~> 1.50.0)
       activerecord (~> 3.2.9)
-      acts_as_list (= 0.1.4)
-      awesome_nested_set (= 2.1.4)
+      acts_as_list (= 0.1.9)
+      awesome_nested_set (= 2.1.5)
       aws-sdk (~> 1.11.1)
       cancan (= 1.6.8)
       deface (>= 0.9.0)
       ffaker (~> 1.15.0)
-      highline (= 1.6.11)
+      highline (= 1.6.15)
       httparty (= 0.9.0)
       json (>= 1.5.5)
       kaminari (= 0.13.0)
-      money (= 5.0.0)
+      money (= 5.1.0)
       paperclip (~> 3.0)
       rails (~> 3.2.13)
       railties (~> 3.2.9)
@@ -83,7 +61,7 @@ GIT
       spree_frontend (= 1.3.99)
     spree_frontend (1.3.99)
       deface (>= 0.9.0)
-      jquery-rails (~> 2.2.0)
+      jquery-rails (~> 2.2.1)
       rails (~> 3.2.8)
       select2-rails (~> 3.2)
       spree_api (= 1.3.99)
@@ -92,6 +70,28 @@ GIT
     spree_sample (1.3.99)
       spree_core (= 1.3.99)
 
+GIT
+  remote: git://github.com/jeremydurham/custom-err-msg.git
+  revision: 3a8ec9dddc7a5b0aab7c69a6060596de300c68f4
+  specs:
+    custom_error_message (1.1.1)
+
+GIT
+  remote: git://github.com/openfoodfoundation/better_spree_paypal_express.git
+  revision: 8d95f4544c682634812becaf50999fba0cd04df0
+  branch: spree-upgrade-intermediate
+  specs:
+    spree_paypal_express (2.0.3)
+      paypal-sdk-merchant (= 1.106.1)
+      spree_core (~> 1.3.99)
+
+GIT
+  remote: git://github.com/openfoodfoundation/ofn-qz.git
+  revision: 024680ccea429b2e5428d7b964fa67c52add34ec
+  specs:
+    ofn-qz (0.1.0)
+      railties (~> 3.1)
+
 GIT
   remote: git://github.com/openfoodfoundation/spree_auth_devise.git
   revision: da9eecefc6fe13dedf4c6f3febec79caad839ec3
@@ -174,7 +174,7 @@ GEM
       multi_json (~> 1.0)
     acts-as-taggable-on (3.5.0)
       activerecord (>= 3.2, < 5)
-    acts_as_list (0.1.4)
+    acts_as_list (0.1.9)
     addressable (2.4.0)
     andand (1.3.3)
     angular-rails-templates (0.2.0)
@@ -187,7 +187,7 @@ GEM
     arel (3.0.3)
     ast (2.3.0)
     atomic (1.1.99)
-    awesome_nested_set (2.1.4)
+    awesome_nested_set (2.1.5)
       activerecord (>= 3.0.0)
     awesome_print (1.0.2)
     aws-sdk (1.11.1)
@@ -429,7 +429,7 @@ GEM
       rspec (~> 2.14)
     haml (4.0.4)
       tilt
-    highline (1.6.11)
+    highline (1.6.15)
     hike (1.2.3)
     http_parser.rb (0.5.3)
     httparty (0.9.0)
@@ -478,9 +478,8 @@ GEM
     mini_portile2 (2.1.0)
     momentjs-rails (2.5.1)
       railties (>= 3.1)
-    money (5.0.0)
-      i18n (~> 0.4)
-      json
+    money (5.1.0)
+      i18n (~> 0.6.0)
     multi_json (1.12.1)
     multi_xml (0.6.0)
     newrelic_rpm (3.12.0.288)
@@ -593,8 +592,9 @@ GEM
     rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.2)
-    rspec-rails (2.14.0)
+    rspec-rails (2.14.2)
       actionpack (>= 3.0)
+      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec-core (~> 2.14.0)