Permalink
Browse files

Merge pull request #14026 from sferik/rbx-2

Update Travis settings for Rubinius
  • Loading branch information...
2 parents 6d14c22 + af66c46 commit 7d5454dcdd7c037658bc62ab3af177e5ca3b69ad @carlosantoniodasilva carlosantoniodasilva committed Feb 12, 2014
Showing with 2 additions and 7 deletions.
  1. +2 −2 .travis.yml
  2. +0 −5 Gemfile
View
@@ -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:
View
@@ -76,11 +76,6 @@ platforms :jruby do
end
end
-platforms :rbx do
- gem 'psych', '~> 2.0'
- gem 'rubysl', '~> 2.0'
-end
-
# gems that are necessary for ActiveRecord tests with Oracle database
if ENV['ORACLE_ENHANCED']
platforms :ruby do

0 comments on commit 7d5454d

Please sign in to comment.