mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-09 08:25:55 +00:00
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: .travis.yml
This commit is contained in:
commit
00ce2be148
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue