Merged hotfix-csp into develop

master
Keith Irwin 2018-03-06 04:15:39 +00:00
commit f111fc57c0
No known key found for this signature in database
GPG Key ID: 378933C743E2BBC0
2 changed files with 5 additions and 4 deletions

View File

@ -4,10 +4,11 @@ node_js:
branches:
only:
- master
before_install:
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"
after_script:
- npm run cover && cat coverage/lcov.info | node_modules/coveralls/bin/coveralls.js

View File

@ -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'"],