From d71ec5aa08c86b57c48eb5ce962f9bf75602e54d Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Thu, 3 Feb 2022 23:14:37 -0800 Subject: [PATCH] Fix typo in CSP configuration `frame_ancestors`, not `frame_ancestor` This mirrors the change in https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/5583. Changelog: fixed --- doc/charts/globals.md | 2 +- spec/configuration/gitlab-yml-erb_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/charts/globals.md b/doc/charts/globals.md index b54694deaf..39a8d71f8d 100644 --- a/doc/charts/globals.md +++ b/doc/charts/globals.md @@ -955,7 +955,7 @@ global: directives: default_src: "'self'" script_src: "'self' 'unsafe-inline' 'unsafe-eval' https://www.recaptcha.net https://apis.google.com" - frame_ancestor: "'self'" + frame_ancestors: "'self'" frame_src: "'self' 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:" style_src: "'self' 'unsafe-inline'" diff --git a/spec/configuration/gitlab-yml-erb_spec.rb b/spec/configuration/gitlab-yml-erb_spec.rb index 6e39bb2620..a52806fcba 100644 --- a/spec/configuration/gitlab-yml-erb_spec.rb +++ b/spec/configuration/gitlab-yml-erb_spec.rb @@ -32,7 +32,7 @@ describe 'gitlab.yml.erb configuration' do report_only: false directives: connect_src: "'self'" - frame_ancestor: "'self'" + frame_ancestors: "'self'" frame_src: "'self'" img_src: "* data: blob:" object_src: "'none'" -- GitLab