Skip to content

Commit 852da40

Browse files
authored
Merge pull request #27 from waiting-for-dev/waiting-for-dev/support_forked_solidus_frontend
Update to use forked solidus_frontend when needed
2 parents 4268f6f + 12b2371 commit 852da40

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

Gemfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@ source 'https://rubygems.org'
44
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
55

66
branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
7-
gem 'solidus', github: 'solidusio/solidus', branch: branch
7+
solidus_git, solidus_frontend_git = if (branch == 'master') || (branch >= 'v3.2')
8+
%w[solidusio/solidus solidusio/solidus_frontend]
9+
else
10+
%w[solidusio/solidus] * 2
11+
end
12+
gem 'solidus', github: solidus_git, branch: branch
13+
gem 'solidus_frontend', github: solidus_frontend_git, branch: branch
814

915
# Needed to help Bundler figure out how to resolve dependencies,
1016
# otherwise it takes forever to resolve them.

0 commit comments

Comments
 (0)