Test on rails edge

projectblacklight · Apr 25, 2017 · f10ab05 · f10ab05
1 parent 2f59129
commit f10ab05
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ rvm:
 matrix:
   include:
     - rvm: 2.3.3
-      env: "RAILS_VERSION=5.1.0.rc2"
+      env: "RAILS_VERSION=edge"
     - rvm: jruby-9.1.7.0
       env: "RAILS_VERSION=5.0.2 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
   allow_failures:

diff --git a/Gemfile b/Gemfile
@@ -24,7 +24,7 @@ else
 
   if ENV['RAILS_VERSION']
     if ENV['RAILS_VERSION'] == 'edge'
-      gem 'rails', github: 'rails/rails'
+      gem 'rails', github: 'rails/rails', branch: '5-1-stable'
       ENV['ENGINE_CART_RAILS_OPTIONS'] = '--edge --skip-turbolinks'
     else
       gem 'rails', ENV['RAILS_VERSION']