Skip to content

Commit

Permalink
Merge pull request #1035 from justinfrench/fix-travis
Browse files Browse the repository at this point in the history
Fix Travis
  • Loading branch information
justinfrench committed May 5, 2014
2 parents 16a528a + 74bbde5 commit 1bdf6d3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Expand Up @@ -5,15 +5,15 @@ before_install:
rvm:
- 1.9.3
- 2.0.0
- 2.1.0
- 2.1
gemfile:
- gemfiles/rails_3.2.gemfile
- gemfiles/rails_4.gemfile
- gemfiles/rails_4.0.4.gemfile
- gemfiles/rails_edge.gemfile
env:
- DEFER_GC=false RAILS_EDGE=true
script: "rake spec"
script: "bundle exec rake spec"
matrix:
allow_failures:
- rvm: 1.9.3
Expand All @@ -22,6 +22,6 @@ matrix:
- rvm: 2.0.0
gemfile: gemfiles/rails_edge.gemfile
env: DEFER_GC=false RAILS_EDGE=true
- rvm: 2.1.0
- rvm: 2.1
gemfile: gemfiles/rails_edge.gemfile
env: DEFER_GC=false RAILS_EDGE=true

0 comments on commit 1bdf6d3

Please sign in to comment.