Merge branch 'master' into sortenter

lukasoppermann · Mar 2, 2019 · b1ceb35 · b1ceb35
2 parents 6eaf28b + b9ff912
commit b1ceb35
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,6 @@ language: node_js
 node_js:
   - "node"
 before_install:
-  - npm i -g npm@5.7.1
   - npm install -g greenkeeper-lockfile@1
   - greenkeeper-lockfile-update
 install:

diff --git a/package.json b/package.json
@@ -55,7 +55,12 @@
     },
     "testMatch": [
       "**/__tests__/**/*.test.(ts|js)"
-    ]
+    ],
+    "globals": {
+      "ts-jest": {
+        "diagnostics": false
+      }
+    }
   },
   "standard": {
     "parser": "typescript-eslint-parser",