Merge pull request #23 from twingly/update-marked-dependency

Update marked due to CVE-2017-1000427
twingly · Feb 15, 2018 · 6ceff3c · 6ceff3c
2 parents a61faeb + f7d0a5a
commit 6ceff3c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,10 +2,12 @@ language: node_js
 node_js:
   - "0.12"
   - 4    # latest 4.x release
-  - 5    # latest 5.x release
   - 6    # latest 6.x release
-  - 7    # latest 7.x release
+  - 8    # latest 8.x release
   - node # latest stable Node.js release
+matrix:
+  allow_failures:
+    - node_js: node
 sudo: false
 notifications:
   email: false

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,7 +17,8 @@
     "jsdoc": "^3.4.0",
     "mocha": "^2.4.5",
     "nock-vcr": "0.0.0",
-    "rocha": "^2.0.0"
+    "rocha": "^2.0.0",
+    "marked": "~> 0.3.9"
   },
   "scripts": {
     "preversion": "npm test",