diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-11-07 13:38:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-07 13:38:42 -0500 |
| commit | 1de3041e3be7be8477ee28c7ece616a5975321bd (patch) | |
| tree | 59441caccf51e29e44d29c3cf3f1a7a1e7a89ab0 | |
| parent | e91dd52d561e61ec4e41bf01c20d9e1aab579e4a (diff) | |
| parent | 7a7b23f95a397064616424749ad549c63ec8667e (diff) | |
| download | rails-1de3041e3be7be8477ee28c7ece616a5975321bd.tar.gz rails-1de3041e3be7be8477ee28c7ece616a5975321bd.tar.bz2 rails-1de3041e3be7be8477ee28c7ece616a5975321bd.zip | |
Merge pull request #26990 from kirs/upgrade-jruby
Upgrade JRuby to satisfy gemfile
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index d29ef1702a..d465378c72 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,14 +59,14 @@ matrix: - "GEM=ar:mysql2" addons: mariadb: 10.0 - - rvm: jruby-9.0.5.0 + - rvm: jruby-9.1.5.0 jdk: oraclejdk8 env: - "JRUBY_OPTS='--dev -J-Xmx1024M'" - "GEM='ap'" allow_failures: - rvm: ruby-head - - rvm: jruby-9.0.5.0 + - rvm: jruby-9.1.5.0 fast_finish: true notifications: |