about summary refs log tree commit diff
path: root/.travis.yml
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-05-18 17:20:32 +0200
committerGitHub <noreply@github.com>2018-05-18 17:20:32 +0200
commit625c4f36ef394215e65e19157bfaf60e7de94b5f (patch)
tree72560d046b60c8478d10f26c212a70870e50eb2d /.travis.yml
parent023dfa119ed43fe35188e560c24cd3091c14ad0b (diff)
parent765fc6700cefcf326e8e4104f7f82ac5ed9b9bea (diff)
Merge pull request #490 from glitch-soc/merge-upstream
Merge with tootsuite @ 57b503d4ef0754e4651eae26b628cba60e1ab4e9
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
1 files changed, 5 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 238b9a3f6..1529c81fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,7 +37,7 @@ addons:
 
 rvm:
   - 2.4.3
-  - 2.5.0
+  - 2.5.1
 
 services:
   - redis-server
@@ -47,6 +47,10 @@ install:
   - bundle install --path=vendor/bundle --with pam_authentication --without development production --retry=3 --jobs=16
   - yarn install
 
+# https://github.com/travis-ci/travis-ci/issues/9333
+before_install:
+  - gem install bundler
+
 before_script:
   - travis_wait ./bin/rails parallel:create parallel:load_schema parallel:prepare assets:precompile