From 65c12837e7c131c09a4e8eab304c98bc2d1da96f Mon Sep 17 00:00:00 2001 From: Jonathan Date: Sat, 9 Jul 2016 00:46:03 +0100 Subject: [PATCH 1/3] Fixed grammar and spelling mistakes in Shop --- server/views/resources/shop.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/views/resources/shop.jade b/server/views/resources/shop.jade index 9e29788aef..bc561c60fc 100644 --- a/server/views/resources/shop.jade +++ b/server/views/resources/shop.jade @@ -19,8 +19,8 @@ block content .row .col-xs-12.col-sm-10.col-sm-offset-1.col-md-8.col-md-offset-2.text-center img.img-responsive.img-center(src='//i.imgur.com/BTtb8P0g.jpg') - h3 Get a $10 credit your for own Digital Ocean server. - p Digital Ocean gives our community a $25 credit after you spend $25. + h3 Get $10 in credit for your own Digital Ocean server. + p Digital Ocean gives our community $25 in credit after you spend $25. a.btn.btn-cta.signup-btn.btn-block(href="//m.do.co/c/ba8a71773373" target='_blank' onClick="ga('send', 'event', 'SHOP', 'SHOP-DIGITAL-OCEAN', 'Digital Ocean affiliate button clicked');") Claim your $10 credit now hr .row From 98dbf8f77e9b20545a6789a770b96a00d39440bd Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sat, 9 Jul 2016 00:55:06 +0000 Subject: [PATCH 2/3] fix: package.json & .snyk to reduce vulnerabilities --- .snyk | 20 ++++++++++++++++++++ package.json | 12 ++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 .snyk diff --git a/.snyk b/.snyk new file mode 100644 index 0000000000..de9db307f1 --- /dev/null +++ b/.snyk @@ -0,0 +1,20 @@ +version: v1.5.0 +ignore: {} +patch: + 'npm:marked:20150520': + - gulp-notify > node-notifier > cli-usage > marked: + patched: '2016-07-09T00:55:04.882Z' + 'npm:minimatch:20160620': + - gulp > vinyl-fs > glob-stream > minimatch: + patched: '2016-07-09T00:55:04.882Z' + - gulp > vinyl-fs > glob-stream > glob > minimatch: + patched: '2016-07-09T00:55:04.882Z' + - rev-del > mocha > glob > minimatch: + patched: '2016-07-09T00:55:04.882Z' + - gulp > vinyl-fs > glob-watcher > gaze > globule > minimatch: + patched: '2016-07-09T00:55:04.882Z' + - gulp > vinyl-fs > glob-watcher > gaze > globule > glob > minimatch: + patched: '2016-07-09T00:55:04.882Z' + 'npm:uglify-js:20151024': + - jade > transformers > uglify-js: + patched: '2016-07-09T00:55:04.882Z' diff --git a/package.json b/package.json index de409cc6df..77a9c2c2bc 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,9 @@ "lint-json": "npm run lint-server && npm run lint-challenges && npm run lint-resources && npm run lint-utils", "test-challenges": "babel-node seed/test-challenges.js | tap-spec", "pretest": "npm run lint", - "test": "npm run test-challenges" + "test": "npm run test-challenges", + "snyk-protect": "snyk protect", + "prepublish": "npm run snyk-protect" }, "license": "(BSD-3-Clause AND CC-BY-SA-4.0)", "dependencies": { @@ -132,7 +134,8 @@ "webpack": "^1.9.12", "webpack-stream": "^3.1.0", "xss-filters": "^1.2.6", - "yargs": "^4.1.0" + "yargs": "^4.1.0", + "snyk": "^1.17.0" }, "devDependencies": { "browser-sync": "^2.9.12", @@ -144,5 +147,6 @@ "sinon": "^1.17.3", "tap-spec": "^4.1.1", "tape": "^4.2.2" - } -} + }, + "snyk": true +} \ No newline at end of file From 21ffe77dc54a316dbda6a58e8f4de41b02e0060c Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sat, 9 Jul 2016 01:06:51 +0000 Subject: [PATCH 3/3] fix: package.json & .snyk to reduce vulnerabilities --- .snyk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.snyk b/.snyk index de9db307f1..9daf4f36d6 100644 --- a/.snyk +++ b/.snyk @@ -18,3 +18,6 @@ patch: 'npm:uglify-js:20151024': - jade > transformers > uglify-js: patched: '2016-07-09T00:55:04.882Z' + 'npm:uglify-js:20150824': + - jade > transformers > uglify-js: + patched: '2016-07-09T01:06:50.803Z'