djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-23 16:44:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into gs-master

Browse Source 
Conflicts:
	.travis.yml
This commit is contained in:
David Yip 2018-01-24 23:10:19 -06:00
commit 00ce2be148
No known key found for this signature in database
GPG Key ID: 7DA0036508FCC0CC
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -8,7 +8,7 @@ cache:
- public/packs-test - public/packs-test
- tmp/cache/babel-loader - tmp/cache/babel-loader
dist: trusty dist: trusty
sudo: required sudo: false
notifications: notifications:
email: false email: false
@ -44,7 +44,6 @@ services:
- redis-server - redis-server
install: install:
- gem update --system
- nvm install - nvm install
- bundle install --path=vendor/bundle --without development production --retry=3 --jobs=16 - bundle install --path=vendor/bundle --without development production --retry=3 --jobs=16
- yarn install - yarn install