aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-12-17 17:26:26 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-12-17 17:26:26 -0200
commit9ca32a67bbcb24f13303718ca1c63b10fcb761ab (patch)
tree2f83b61ecf5405ba127e78153e5a17e012f28e38
parent0167e1d2fbdda9e0783fe1e114f5267bdd431383 (diff)
parent8ae65d3533a86227e683d9f77b7e15ab809e0c34 (diff)
downloadrails-9ca32a67bbcb24f13303718ca1c63b10fcb761ab.tar.gz
rails-9ca32a67bbcb24f13303718ca1c63b10fcb761ab.tar.bz2
rails-9ca32a67bbcb24f13303718ca1c63b10fcb761ab.zip
Merge pull request #355 from jemc/patch-1
Test with rbx-2 on Travis-CI
-rw-r--r--.travis.yml6
1 files changed, 2 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 22287e1195..b8a2f0019e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,15 +8,13 @@ env:
global:
- JRUBY_OPTS='--dev -J-Xmx1024M'
rvm:
+ - rbx-2
+ - jruby-head
- 2.0.0
- 2.1
- 2.2
- ruby-head
- - rbx
- - jruby-head
matrix:
- allow_failures:
- - rvm: rbx
fast_finish: true
bundler_args: --jobs 3 --retry 3
notifications: