aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2014-02-12 10:12:13 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2014-02-12 10:12:13 -0200
commit7d5454dcdd7c037658bc62ab3af177e5ca3b69ad (patch)
tree04db6dbe98085439d159a5109aa3107c30ffa9f6 /.travis.yml
parent6d14c222dd23ae4a7c012333b7cbb43973074746 (diff)
parentaf66c4697c2ca3d67c853cae6c900b124c354e90 (diff)
downloadrails-7d5454dcdd7c037658bc62ab3af177e5ca3b69ad.tar.gz
rails-7d5454dcdd7c037658bc62ab3af177e5ca3b69ad.tar.bz2
rails-7d5454dcdd7c037658bc62ab3af177e5ca3b69ad.zip
Merge pull request #14026 from sferik/rbx-2
Update Travis settings for Rubinius
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 3ddaf86fb2..4233b136a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ rvm:
- 1.9.3
- 2.0.0
- 2.1.0
- - rbx
+ - rbx-2
- jruby
env:
- "GEM=railties"
@@ -17,7 +17,7 @@ env:
- "GEM=ar:postgresql"
matrix:
allow_failures:
- - rvm: rbx
+ - rvm: rbx-2
- rvm: jruby
fast_finish: true
notifications: