From 87581d7fdd172edb9cff8741f3d84fbe22a33ee7 Mon Sep 17 00:00:00 2001 From: John Hawthorn Date: Wed, 22 Nov 2017 15:01:34 -0800 Subject: [PATCH] Test against Solidus master --- Gemfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 7625692..3b85a38 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,7 @@ source "https://rubygems.org" -#branch = ENV.fetch('SOLIDUS_BRANCH', 'master') -#gem "solidus", github: "solidusio/solidus", branch: branch -gem "solidus", github: "jhawthorn/solidus", branch: 'remove_stock_transfers' +branch = ENV.fetch('SOLIDUS_BRANCH', 'master') +gem "solidus", github: "solidusio/solidus", branch: branch gem 'pg' gem 'mysql2'