Merge pull request #9630 from FreeCodeCamp/staging

Release staging

.snyk

@@ -0,0 +1,23 @@
+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'
+  'npm:uglify-js:20150824':
+    - jade > transformers > uglify-js:
+        patched: '2016-07-09T01:06:50.803Z'

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
+}

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