Bundle incremental Spree upgrade

Gemfile

@@ -9,7 +9,7 @@ gem 'i18n', '~> 0.6.11'
 gem 'nokogiri', '>= 1.6.7.1'
 
 gem 'pg'
-gem 'spree', github: 'openfoodfoundation/spree', branch: '1-3-stable'
+gem 'spree', github: 'openfoodfoundation/spree', branch: 'spree-upgrade-step1c'
 gem 'spree_i18n', github: 'spree/spree_i18n', branch: '1-3-stable'
 gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '1-3-stable'
 

Gemfile.lock

@@ -23,45 +23,48 @@ GIT
 
 GIT
   remote: git://github.com/openfoodfoundation/spree.git
-  revision: 6e3edfe40a5de8eba0095b2c5f3db9ea54c3afda
+  revision: a4c439570b77afa50f9e36299811f293232bd281
-  branch: 1-3-stable
+  branch: spree-upgrade-step1c
   specs:
-    spree (1.3.6.beta)
+    spree (1.3.99)
-      spree_api (= 1.3.6.beta)
+      spree_api (= 1.3.99)
-      spree_cmd (= 1.3.6.beta)
+      spree_cmd (= 1.3.99)
-      spree_core (= 1.3.6.beta)
+      spree_core (= 1.3.99)
-      spree_promo (= 1.3.6.beta)
+      spree_dash (= 1.3.99)
-      spree_sample (= 1.3.6.beta)
+      spree_promo (= 1.3.99)
-    spree_api (1.3.6.beta)
+      spree_sample (= 1.3.99)
-      spree_core (= 1.3.6.beta)
+    spree_api (1.3.99)
+      spree_core (= 1.3.99)
       versioncake (= 0.4.0)
-    spree_cmd (1.3.6.beta)
+    spree_cmd (1.3.99)
       thor (>= 0.14.6)
-    spree_core (1.3.6.beta)
+    spree_core (1.3.99)
-      activemerchant (~> 1.34)
+      activemerchant (~> 1.50.0)
       acts_as_list (= 0.1.4)
       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.18)
+      highline (= 1.6.11)
-      jquery-rails (~> 2.2.0)
+      jquery-rails (~> 2.0)
       json (>= 1.5.5)
-      kaminari (= 0.14.1)
+      kaminari (= 0.13.0)
-      money (= 5.1.1)
+      money (= 5.0.0)
       paperclip (~> 3.0)
       rabl (= 0.7.2)
-      rails (~> 3.2.16)
+      rails (~> 3.2.13)
       ransack (= 0.7.2)
-      select2-rails (= 3.5.9.3)
+      select2-rails (~> 3.2)
-      state_machine (= 1.1.2)
+      state_machine (= 1.2.0)
       stringex (~> 1.3.2)
-      truncate_html (~> 0.5.5)
+    spree_dash (1.3.99)
-    spree_promo (1.3.6.beta)
+      httparty (~> 0.8.1)
-      spree_core (= 1.3.6.beta)
+      spree_core (= 1.3.99)
-    spree_sample (1.3.6.beta)
+    spree_promo (1.3.99)
-      spree_core (= 1.3.6.beta)
+      spree_core (= 1.3.99)
+    spree_sample (1.3.99)
+      spree_core (= 1.3.99)
 
 GIT
   remote: git://github.com/spree/deface.git
@@ -123,8 +126,8 @@ GEM
       sprockets (~> 2.2.1)
     active_model_serializers (0.8.3)
       activemodel (>= 3.0)
-    activemerchant (1.57.0)
+    activemerchant (1.50.0)
-      activesupport (>= 3.2.14, < 5.1)
+      activesupport (>= 3.2.14, < 5.0.0)
       builder (>= 2.1.2, < 4.0.0)
       i18n (>= 0.6.9)
       nokogiri (~> 1.4)
@@ -167,9 +170,7 @@ GEM
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
     blockenspiel (0.4.5)
-    bugsnag (1.5.2)
+    bugsnag (4.1.0)
-      httparty (>= 0.6, < 1.0)
-      multi_json (~> 1.0)
     builder (3.0.4)
     byebug (2.7.0)
       columnize (~> 0.3)
@@ -189,7 +190,7 @@ GEM
     climate_control (0.0.3)
       activesupport (>= 3.0)
     cliver (0.3.2)
-    cocaine (0.5.7)
+    cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.0.9)
     coffee-rails (3.2.2)
@@ -404,12 +405,12 @@ GEM
       zeus
     haml (4.0.4)
       tilt
-    highline (1.6.18)
+    highline (1.6.11)
     hike (1.2.3)
     http_parser.rb (0.5.3)
-    httparty (0.13.1)
+    httparty (0.8.3)
-      json (~> 1.8)
+      multi_json (~> 1.0)
-      multi_xml (>= 0.5.2)
+      multi_xml
     i18n (0.6.11)
     immigrant (0.1.6)
       activerecord (>= 3.0)
@@ -417,16 +418,17 @@ GEM
     inflecto (0.0.2)
     ipaddress (0.8.0)
     journey (1.0.4)
-    jquery-rails (2.2.2)
+    jquery-rails (2.3.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.3)
     json_spec (1.1.1)
       multi_json (~> 1.0)
       rspec (~> 2.0)
-    kaminari (0.14.1)
+    kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
     kgio (2.9.3)
     knapsack (1.5.1)
       rake
@@ -494,7 +496,7 @@ GEM
       activesupport (>= 2.3.14)
       multi_json (~> 1.0)
     rack (1.4.7)
-    rack-cache (1.2)
+    rack-cache (1.6.1)
       rack (>= 0.4)
     rack-livereload (0.3.15)
       rack
@@ -521,7 +523,7 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     raindrops (0.13.0)
-    rake (10.4.2)
+    rake (11.1.2)
     ransack (0.7.2)
       actionpack (~> 3.0)
       activerecord (~> 3.0)
@@ -571,7 +573,7 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    select2-rails (3.5.9.3)
+    select2-rails (3.5.10)
       thor (~> 0.14)
     shoulda-matchers (1.1.0)
       activesupport (>= 3.0.0)
@@ -583,7 +585,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    state_machine (1.1.2)
+    state_machine (1.2.0)
     stringex (1.3.3)
     therubyracer (0.12.0)
       libv8 (~> 3.16.14.0)
@@ -601,7 +603,7 @@ GEM
       sprockets (>= 2.0.0)
     turn (0.8.3)
       ansi
-    tzinfo (0.3.44)
+    tzinfo (0.3.49)
     uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)