From 22b54312797a7869e7e554c20c7bcb017ab14e2f Mon Sep 17 00:00:00 2001 From: enricostano Date: Wed, 19 Apr 2017 15:46:38 +0200 Subject: [PATCH] Start spree upgrade step 6 --- Gemfile | 2 +- Gemfile.lock | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index b714a91050..32983d2b8e 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: 'coopdevs/spree', branch: 'spree-upgrade-step-5' +gem 'spree', github: 'coopdevs/spree', branch: 'spree-upgrade-step-6' 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 54b7e9f204..e430414f2d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,8 +8,8 @@ GIT GIT remote: git://github.com/coopdevs/spree.git - revision: ff96a88494c0f0d13e06cc620a2b90372f52c8d7 - branch: spree-upgrade-step-5 + revision: 93337acbee00dd3f5702c6dd1f668112f3809400 + branch: spree-upgrade-step-6 specs: spree (1.3.99) spree_api (= 1.3.99) @@ -34,9 +34,7 @@ GIT spree_cmd (1.3.99) thor (>= 0.14.6) spree_core (1.3.99) - actionmailer (~> 3.2.9) activemerchant (~> 1.50.0) - activerecord (~> 3.2.9) acts_as_list (= 0.1.9) awesome_nested_set (= 2.1.5) aws-sdk (~> 1.11.1) @@ -50,7 +48,6 @@ GIT money (= 5.1.0) paperclip (~> 3.0) rails (~> 3.2.13) - railties (~> 3.2.9) ransack (= 0.7.2) state_machine (= 1.2.0) stringex (~> 1.3.2)