Merge pull request #2026 from connorshea/rails-5-gemfile

Add Rails 5.0 stable gemfile for testing.
carrierwaveuploader · Sep 26, 2016 · bd692b1 · bd692b1
2 parents 7dedc2e + 9f46d1e
commit bd692b1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,6 +20,7 @@ gemfile:
   - gemfiles/rails-4-0-stable.gemfile
   - gemfiles/rails-4-1-stable.gemfile
   - gemfiles/rails-4-2-stable.gemfile
+  - gemfiles/rails-5-0-stable.gemfile
   - gemfiles/rails-master.gemfile
 
 sudo: false
@@ -37,10 +38,16 @@ matrix:
       gemfile: Gemfile
     - rvm: 2.1
       gemfile: gemfiles/rails-master.gemfile
+    - rvm: 2.0
+      gemfile: gemfiles/rails-5-0-stable.gemfile
+    - rvm: 2.1
+      gemfile: gemfiles/rails-5-0-stable.gemfile
     - rvm: jruby
       gemfile: Gemfile
     - rvm: jruby
       gemfile: gemfiles/rails-master.gemfile
+    - rvm: jruby
+      gemfile: gemfiles/rails-5-0-stable.gemfile
     - rvm: jruby-head
       gemfile: gemfiles/rails-master.gemfile
   allow_failures:

diff --git a/gemfiles/rails-5-0-stable.gemfile b/gemfiles/rails-5-0-stable.gemfile
@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "rails", :github => "rails/rails", :branch => "5-0-stable"
+gem "activemodel-serializers-xml"
+
+gemspec :path => "../"