From 2284f202070aa2e49156cc52b3b1596a7d5aadec Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 29 Jul 2019 11:59:29 +0200
Subject: Add gitlab ci support

---
 package.json | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 300f54d9f..e8821bc70 100644
--- a/package.json
+++ b/package.json
@@ -60,17 +60,19 @@
     "postinstall": "test -n \"$NOCLIENT\" || (cd client && yarn install --pure-lockfile)",
     "tsc": "tsc",
     "commander": "commander",
-    "lint": "npm run travis -- lint",
+    "lint": "npm run ci -- lint",
     "ng": "ng",
     "nodemon": "nodemon",
     "ts-node": "ts-node",
     "tslint": "tslint",
     "concurrently": "concurrently",
+    "mocha-parallel-tests": "mocha-parallel-tests",
     "sasslint": "sass-lint --verbose --no-exit",
     "sasslint:fix": "sass-lint-auto-fix -c .sass-lint.yml --verbose",
     "mocha": "mocha",
-    "travis": "scripty",
+    "ci": "scripty",
     "release": "scripty",
+    "nightly": "scripty",
     "client-report": "scripty"
   },
   "husky": {
@@ -93,7 +95,7 @@
     ]
   },
   "resolutions": {
-    "@types/bluebird": "3.5.21"
+    "@types/bluebird": "3.5.27"
   },
   "dependencies": {
     "apicache": "^1.4.0",
@@ -206,7 +208,7 @@
     "maildev": "^1.0.0-rc3",
     "marked-man": "^0.6.0",
     "mocha": "^6.0.0",
-    "mocha-parallel-tests": "^2.1.0",
+    "mocha-parallel-tests": "^2.2.1",
     "nodemon": "^1.18.6",
     "sass-lint": "^1.12.1",
     "source-map-support": "^0.5.0",
-- 
cgit v1.2.3