diff options
| author | Bruno Perles | 2015-11-05 16:43:17 +0100 |
|---|---|---|
| committer | Bruno Perles | 2015-11-05 16:43:17 +0100 |
| commit | 9cb484fb23c36654fb19e303a63ca5a5a4f6a7e1 (patch) | |
| tree | 1db6bf5df413e37da6a2de829d9b67f8185a4ad3 | |
| parent | 34ac91ca121ceec5508557e532abfaa38d2b297a (diff) | |
| download | chouette-core-9cb484fb23c36654fb19e303a63ca5a5a4f6a7e1.tar.bz2 | |
update travis matrix
| -rw-r--r-- | .travis.yml | 12 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 55a4407c1..f208b9fd6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,16 +19,22 @@ rvm: - 2.1.7 - 2.2.3 - jruby-19mode + - jruby-head jdk: - oraclejdk7 - openjdk7 matrix: exclude: - - rvm: 1.9.3 + - rvm: 1.9.3 jdk: openjdk7 - - rvm: 2.1.7 + - rvm: 2.1.7 jdk: openjdk7 - - rvm: 2.2.3 + - rvm: 2.2.3 + jdk: openjdk7 + allow_failures: + - rvm: jruby-head + jdk: oraclejdk7 + - rvm: jruby-head jdk: openjdk7 notifications: email: @@ -147,7 +147,7 @@ gem 'rails-i18n', '~> 4.0.0' gem 'devise-i18n' # Rails Assets -source 'https://rails-assets.org' do +source 'http://rails-assets.org' do gem 'rails-assets-morrisjs', '~> 0.5.1' gem 'rails-assets-raphael', '~> 2.1.3' gem 'rails-assets-footable', '~> 2.0.3' diff --git a/Gemfile.lock b/Gemfile.lock index 0fc14a14c..4d6ccb800 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,7 +14,7 @@ GIT GEM remote: http://rubygems.org/ - remote: https://rails-assets.org/ + remote: http://rails-assets.org/ specs: RedCloth (4.2.9) RedCloth (4.2.9-java) |