Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-13 18:17:20 +00:00
parent f8e934f955 fd385e256d
commit d75a6054a0
55 changed files with 441 additions and 226 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,5 +51,5 @@ before_script:

 script:
  - travis_retry bundle exec parallel_test spec/ --group-by filesize --type rspec
-  - yarn test
+  - yarn run test:jest
  - bundle exec i18n-tasks check-normalized && bundle exec i18n-tasks unused