diff options
author | Erik Michaels-Ober <sferik@gmail.com> | 2014-02-12 12:55:47 +0100 |
---|---|---|
committer | Erik Michaels-Ober <sferik@gmail.com> | 2014-02-12 12:55:47 +0100 |
commit | af66c4697c2ca3d67c853cae6c900b124c354e90 (patch) | |
tree | 04db6dbe98085439d159a5109aa3107c30ffa9f6 | |
parent | 6d14c222dd23ae4a7c012333b7cbb43973074746 (diff) | |
download | rails-af66c4697c2ca3d67c853cae6c900b124c354e90.tar.gz rails-af66c4697c2ca3d67c853cae6c900b124c354e90.tar.bz2 rails-af66c4697c2ca3d67c853cae6c900b124c354e90.zip |
Update Travis settings for Rubinius
/cc @brixen
-rw-r--r-- | .travis.yml | 4 | ||||
-rw-r--r-- | Gemfile | 5 |
2 files changed, 2 insertions, 7 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: @@ -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 |