Merged hotfix-csp into develop
commit
f111fc57c0
|
@ -4,10 +4,11 @@ node_js:
|
||||||
branches:
|
branches:
|
||||||
only:
|
only:
|
||||||
- master
|
- master
|
||||||
before_install:
|
before_script:
|
||||||
- echo "module.exports = require('./travis.js')" > config/env/env.js
|
- echo "module.exports = require('./travis.js')" > config/env/env.js
|
||||||
script:
|
script:
|
||||||
- npm run cover
|
- npm run minify & npm run build
|
||||||
|
|
||||||
# Send coverage data to Coveralls
|
# 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
|
||||||
|
|
|
@ -88,7 +88,7 @@ let ready_promise_list = []
|
||||||
'img-src': ["'self'",
|
'img-src': ["'self'",
|
||||||
'https://www.google-analytics.com',
|
'https://www.google-analytics.com',
|
||||||
'https://maps.gstatic.com',
|
'https://maps.gstatic.com',
|
||||||
'https://maps.googleapis.com',
|
'https://*.googleapis.com',
|
||||||
'https://http.cat',
|
'https://http.cat',
|
||||||
],
|
],
|
||||||
'object-src': ["'none'"],
|
'object-src': ["'none'"],
|
||||||
|
|
Loading…
Reference in New Issue