From 43dbc9108714c11affb8a0f08a46a594cbe01d26 Mon Sep 17 00:00:00 2001 From: Keith Irwin Date: Tue, 6 Mar 2018 04:00:45 +0000 Subject: [PATCH 1/2] Tried to fix travis --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6a6d197..d2fb6f1 100755 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,11 @@ node_js: branches: only: - master -build: +before_script: - echo "module.exports = require('./travis.js')" > config/env/env.js script: - - npm run cover + - npm run minify & npm run build # Send coverage data to Coveralls -after_script: "cat coverage/lcov.info | node_modules/coveralls/bin/coveralls.js" \ No newline at end of file +after_script: + - npm run cover && cat coverage/lcov.info | node_modules/coveralls/bin/coveralls.js \ No newline at end of file From 5e52ee57eef387ae208b0fde3a1b80b641d17b7b Mon Sep 17 00:00:00 2001 From: Keith Irwin Date: Tue, 6 Mar 2018 04:15:24 +0000 Subject: [PATCH 2/2] Fixed CSP error --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index a6381ca..c3f97be 100755 --- a/server.js +++ b/server.js @@ -88,7 +88,7 @@ let ready_promise_list = [] 'img-src': ["'self'", 'https://www.google-analytics.com', 'https://maps.gstatic.com', - 'https://maps.googleapis.com', + 'https://*.googleapis.com', 'https://http.cat', ], 'object-src': ["'none'"],