diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-10-31 15:18:24 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-10-31 15:18:24 -0700 |
| commit | aaedb1a2e823b2b5958f1d15d0e4441172028df9 (patch) | |
| tree | 017e4288a40e70c1a6cba719399996eca1f1089f | |
| parent | 3f2230b9ece12b93f9bd6da0e1532b8771aad886 (diff) | |
| parent | 6bb56b2c1919d4cd20b7c3b8cf28989786d635bc (diff) | |
| download | rails-aaedb1a2e823b2b5958f1d15d0e4441172028df9.tar.gz rails-aaedb1a2e823b2b5958f1d15d0e4441172028df9.tar.bz2 rails-aaedb1a2e823b2b5958f1d15d0e4441172028df9.zip | |
Merge pull request #12722 from razielgn/update-travis-rbx
Updated Rubinius on Travis to 2.1.1
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | Gemfile | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 033606f9d9..a2f47e495c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ rvm: - 1.9.3 - 2.0.0 - jruby-head - - rbx-19mode + - rbx-2.1.1 env: - "GEM=railties" - "GEM=ap,am,amo,as,av" @@ -17,7 +17,7 @@ env: matrix: allow_failures: - rvm: jruby-head - - rvm: rbx-19mode + - rvm: rbx-2.1.1 notifications: email: false irc: @@ -78,6 +78,12 @@ platforms :jruby do end end +platforms :rbx do + gem 'psych' + gem 'rubysl-mathn' + gem 'rubysl-matrix' +end + # gems that are necessary for ActiveRecord tests with Oracle database if ENV['ORACLE_ENHANCED'] platforms :ruby do |