diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-24 23:10:19 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-01-24 23:10:19 -0600 |
| commit | 00ce2be148a06ddd7e692ce963dfab356e331629 (patch) | |
| tree | 42631b78f2ad352b9368a746cbcb84e06c74808b | |
| parent | 0e10667fbe8b565b05dd2f34c3ee14bed7f36967 (diff) | |
| parent | 7e07e61a302815c8e141d02756280213e7b6f391 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: .travis.yml
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 321dbf7b1..c9a442aed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ cache: - public/packs-test - tmp/cache/babel-loader dist: trusty -sudo: required +sudo: false notifications: email: false @@ -44,7 +44,6 @@ services: - redis-server install: - - gem update --system - nvm install - bundle install --path=vendor/bundle --without development production --retry=3 --jobs=16 - yarn install |