Merge branch 'master' into karma

This commit is contained in:
Kim Gardner
2018-05-25 17:04:30 -04:00
committed by GitHub
5 changed files with 16 additions and 8 deletions
+3 -2
View File
@@ -512,13 +512,14 @@ tracing of GraphQL requests.
**Note: Apollo Engine is a premium service, charges may apply.**
## TALK_ENABLE_STRICT_CSP
<!-- TODO: re-add CSP once we've resolved issues with dynamic webpack loading. -->
<!-- ## TALK_ENABLE_STRICT_CSP
Setting this to `TRUE` will enforce the [Content Security Policy](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP)
(or CSP). By default, this configuration is set to
[report only](https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP#Testing_your_policy)
where the policy is not enforced, but any violations are reported to a provided
URI. (Default `FALSE`)
URI. (Default `FALSE`) -->
## ALLOW_NO_LIMIT_QUERIES