diff options
| author | Federico Ravasio <ravasio.federico@gmail.com> | 2013-11-24 13:59:22 +0100 |
|---|---|---|
| committer | Federico Ravasio <ravasio.federico@gmail.com> | 2013-11-24 14:38:18 +0100 |
| commit | 5541cdcf886072f59d847f6b880db7d57047aec2 (patch) | |
| tree | 26d7bce21119ad9a3e16ac69edc34f3c7a53d074 /.travis.yml | |
| parent | a0f1e6a27ae1a9593c107296d132b4c5605a7175 (diff) | |
| download | rails-5541cdcf886072f59d847f6b880db7d57047aec2.tar.gz rails-5541cdcf886072f59d847f6b880db7d57047aec2.tar.bz2 rails-5541cdcf886072f59d847f6b880db7d57047aec2.zip | |
Properly fix Rubinius dependencies in Gemfile & Travis integration.
Before Rubinius 2.2.0, some parts of the stdlib were lazily loaded, even
if not included in the Gemfile. Now it's 100% required to include the
gem 'rubysl', otherwise the stdlib is not available entirely, breaking
everything.
Also, the rubysl-test-unit gem was depending on minitest ~> 4.7, thus causing
conflicts with Rails's dependency on minitest 5. That is not the case
anymore since rubysl-test-unit 2.0.2, so it is completely safe to
include it fully.
When Travis is going to update RVM to 1.24, it'll be safe to use rbx-2,
thus picking new versions automatically.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 2 |
1 files changed, 1 insertions, 1 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" |