Merge branch 'master' into greenkeeper/@commitlint/config-angular-5.1.1

ianwremmel · Dec 2, 2017 · 6b5e78e · 6b5e78e
2 parents 74bc733 + 32e6897
commit 6b5e78e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/commitlint.config.js b/commitlint.config.js
@@ -1,7 +1,12 @@
 'use strict';
 
-module.exports = {
-  extends: [
-    '@commitlint/config-angular'
-  ]
-};
+if (process.env.CIRCLE_BRANCH && process.env.CIRCLE_BRANCH.includes('greenkeeper')) {
+  module.exports = {};
+}
+else {
+  module.exports = {
+    extends: [
+      '@commitlint/config-angular'
+    ]
+  };
+}
diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "@ianwremmel/exception": "^1.0.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^4.2.2",
+    "@commitlint/cli": "^5.2.0",
     "@commitlint/config-angular": "^5.1.1",
     "@ianwremmel/eslint-config-base": "^1.0.0",
     "@ianwremmel/eslint-config-standard": "^1.1.0",
@@ -47,7 +47,7 @@
     "eslint-plugin-mocha": "^4.11.0",
     "express": "^4.16.2",
     "husky": "^0.14.3",
-    "lint-staged": "^5.0.0",
+    "lint-staged": "^6.0.0",
     "mocha": "^4.0.1",
     "nyc": "^11.2.1",
     "semantic-release": "^8.2.0",