Support Rails 5.1

StemboltHQ · Jun 9, 2017 · 332b01e · 332b01e
1 parent f4e2130
commit 332b01e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -4,8 +4,9 @@ branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
 gem "solidus", github: "solidusio/solidus", branch: branch
 gem "solidus_auth_devise"
 
-if branch == 'master' || branch >= "v2.0"
-  gem "rails-controller-testing", group: :test
+if branch == 'master' || branch >= "v2.3"
+  gem 'rails', '~> 5.0.0' # hack for broken bundler dependency resolution
+elsif branch >= "v2.0"
   gem 'rails', '~> 5.0.0' # hack for broken bundler dependency resolution
 else
   gem "rails", "~> 4.2.7"