From: Nicolas Coden <nicolas@ncoden.fr>
Date: Mon, 4 Jun 2018 20:53:45 +0000 (+0200)
Subject: Merge branch 'develop' into dependabot/npm_and_yarn/@commitlint/cli-7.0.0
X-Git-Tag: v6.6.0~3^2~155^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F11320%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Merge branch 'develop' into dependabot/npm_and_yarn/@commitlint/cli-7.0.0
---

d0e3fe0e50d0bbef18bc35fa190c4c7395ce0be5
diff --cc package.json
index f74f86c6e,bb46e66de..574f3efb8
--- a/package.json
+++ b/package.json
@@@ -32,8 -32,8 +32,8 @@@
    "devDependencies": {
      "@babel/core": "7.0.0-beta.44",
      "@babel/preset-env": "7.0.0-beta.44",
 -    "@commitlint/cli": "^6.1.3",
 +    "@commitlint/cli": "^7.0.0",
-     "@commitlint/config-conventional": "^6.1.3",
+     "@commitlint/config-conventional": "^7.0.1",
      "array-uniq": "^2.0.0",
      "autoprefixer": "^8.2.0",
      "babel-loader": "^8.0.0-beta.0",
diff --cc yarn.lock
index aab390074,2b529ebe3..7f4d9d200
--- a/yarn.lock
+++ b/yarn.lock
@@@ -511,15 -511,15 +511,15 @@@
      get-stdin "5.0.1"
      lodash.merge "4.6.1"
      lodash.pick "4.4.0"
 -    meow "4.0.0"
 +    meow "^5.0.0"
  
- "@commitlint/config-conventional@^6.1.3":
-   version "6.1.3"
-   resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-6.1.3.tgz#6c06eeae04c5ac789c3618df4d52aeda89ffb810"
+ "@commitlint/config-conventional@^7.0.1":
+   version "7.0.1"
+   resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-7.0.1.tgz#276977f8ee60d8c56d7fdd43296af76dfee9b5f7"
  
 -"@commitlint/ensure@^6.1.3":
 -  version "6.1.3"
 -  resolved "https://registry.yarnpkg.com/@commitlint/ensure/-/ensure-6.1.3.tgz#813b58c9fdfae15351b72fe646a162ebdb71ea2a"
 +"@commitlint/ensure@^7.0.0":
 +  version "7.0.0"
 +  resolved "https://registry.yarnpkg.com/@commitlint/ensure/-/ensure-7.0.0.tgz#3d5210bb988416844926895a782a55815731779d"
    dependencies:
      lodash.camelcase "4.3.0"
      lodash.kebabcase "4.1.1"