summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-08-22 17:51:41 +0000
committerStan Hu <stanhu@gmail.com>2019-08-22 17:51:41 +0000
commit8308469fdd031a1f7baa6e95966dfc467eb5df51 (patch)
tree49df6f9798dbb2ab240dbf4e1973d99b3bc14e29 /config
parent9cd2c2a21e55d355f0fa3468451b9529bd41caca (diff)
parent47c3abdfd0495a631e2f3f0ec850c6ed634b7fd7 (diff)
downloadgitlab-ce-8308469fdd031a1f7baa6e95966dfc467eb5df51.tar.gz
Merge branch 'patch-73' into 'master'
Fix typo in Content Security Policy example See merge request gitlab-org/gitlab-ce!32103
Diffstat (limited to 'config')
-rw-r--r--config/gitlab.yml.example2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 2f6658594cc..efddbfcbb57 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -61,7 +61,7 @@ production: &base
form_action:
frame_ancestors: "'self'"
frame_src: "'self' https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://content.googleapis.com https://content-compute.googleapis.com https://content-cloudbilling.googleapis.com https://content-cloudresourcemanager.googleapis.com"
- img_src: "* data: blob"
+ img_src: "* data: blob:"
manifest_src:
media_src:
object_src: "'self' http://localhost:3808 'unsafe-inline' 'unsafe-eval' https://www.google.com/recaptcha/ https://www.recaptcha.net/ https://www.gstatic.com/recaptcha/ https://apis.google.com"