diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-11-24 07:05:58 -0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-11-24 07:05:58 -0800 |
| commit | c459e225a8211c1052725faa89afb3bd3038cdf9 (patch) | |
| tree | 26d7bce21119ad9a3e16ac69edc34f3c7a53d074 | |
| parent | a0f1e6a27ae1a9593c107296d132b4c5605a7175 (diff) | |
| parent | 5541cdcf886072f59d847f6b880db7d57047aec2 (diff) | |
| download | rails-c459e225a8211c1052725faa89afb3bd3038cdf9.tar.gz rails-c459e225a8211c1052725faa89afb3bd3038cdf9.tar.bz2 rails-c459e225a8211c1052725faa89afb3bd3038cdf9.zip | |
Merge pull request #13019 from razielgn/rbx-gemfile-and-travis-fixes
Rubinius Gemfile and travis fixes
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Gemfile | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index b97bd8fd32..cb6a5f1128 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ before_install: rvm: - 1.9.3 - 2.0.0 - - rbx-2.1.1 + - rbx-2.2.1 - jruby-19mode env: - "GEM=railties" @@ -79,10 +79,8 @@ platforms :jruby do end platforms :rbx do - gem 'psych' - gem 'rubysl-mathn' - gem 'rubysl-matrix' - gem 'rubysl-rexml' + gem 'psych', '~> 2.0' + gem 'rubysl', '~> 2.0' end # gems that are necessary for ActiveRecord tests with Oracle database |