From 5b33cbe9aa83de9bdd6c689a1c1298fa55b97ebe Mon Sep 17 00:00:00 2001 From: Pau Perez Date: Wed, 20 Dec 2017 16:37:14 +1100 Subject: [PATCH] Upgrade spree's fork to latest commit Needed to get https://github.com/openfoodfoundation/spree/pull/3/commits/3289b5e31c5a6b4a5ab3cfd4df4f44ca4aedece3 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 949b13ae14..b8cad0ffaa 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ gem 'i18n-js', '~> 3.0.0' gem 'nokogiri', '>= 1.6.7.1' gem 'pg' -gem 'spree', github: 'openfoodfoundation/spree', branch: 'step-6a', ref: '5a76d45' +gem 'spree', github: 'openfoodfoundation/spree', branch: 'step-6a', ref: 'b1b33c7ec682e042bc939aac39dfa1f2de446227' 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 1840185892..3d07ab5d93 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,8 +30,8 @@ GIT GIT remote: https://github.com/openfoodfoundation/spree.git - revision: 5a76d456ff70aea7aae3d25156558d71eb7febf2 - ref: 5a76d45 + revision: b1b33c7ec682e042bc939aac39dfa1f2de446227 + ref: b1b33c7ec682e042bc939aac39dfa1f2de446227 branch: step-6a specs: spree (1.3.99)