Merge pull request #8196 from QuincyLarson/fix/vimeo-to-youtube

Transition Videos from Vimeo to Youtube

server/middlewares/csp.js

@@ -26,10 +26,8 @@ export default function csp() {
         '*.jsdelivr.com',
         '*.twimg.com',
         'https://*.twimg.com',
-        'vimeo.com'
-      ].concat(trusted),
-      connectSrc: [
-        'vimeo.com'
+        '*.youtube.com',
+        '*.ytimg.com'
       ].concat(trusted),
       styleSrc: [
         "'unsafe-inline'",
@@ -62,7 +60,7 @@ export default function csp() {
       frameSrc: [
         '*.gitter.im',
         '*.gitter.im https:',
-        '*.vimeo.com',
+        '*.youtube.com',
         '*.twitter.com',
         '*.ghbtns.com',
         '*.freecatphotoapp.com',

server/views/challenges/showVideo.jade

@@ -17,7 +17,7 @@ block content
                             li.step-text.wrappable!= step
         .col-xs-12.col-sm-12.col-md-8
             .embed-responsive.embed-responsive-16by9
-                iframe.embed-responsive-item(src='//player.vimeo.com/video/#{video}')
+                iframe.embed-responsive-item(src='//www.youtube.com/embed/#{video}?rel=0&showinfo=0')
             .spacer
             if (user)
                 a.btn.btn-primary.btn-big.btn-block#completed-courseware-editorless I've completed this challenge (ctrl + enter)

server/views/challenges/showZiplineOrBasejump.jade

@@ -17,7 +17,7 @@ block content
                             li.step-text.wrappable!= step
         .col-xs-12.col-sm-12.col-md-8
             .embed-responsive.embed-responsive-16by9
-                iframe.embed-responsive-item(src='//player.vimeo.com/video/#{video}')
+                iframe.embed-responsive-item(src='//www.youtube.com/embed/#{video}?rel=0&showinfo=0')
             br
             if (user)
                 a.btn.btn-primary.btn-big.btn-block#completed-zipline-or-basejump I've completed this challenge (ctrl + enter)