summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Bodenmiller <bbodenmiller@hotmail.com>2014-08-20 13:31:15 -0700
committerBen Bodenmiller <bbodenmiller@hotmail.com>2014-08-23 01:05:31 -0700
commita3953a46f401e075c4319a49cf4c88825d78ce17 (patch)
tree575e6d3be7e1a43c3ff28aaf5f2d5c86174e71d0
parent30ea264b3b8207ae279d37e5162f0b934f22dcea (diff)
downloadgitlab-ce-a3953a46f401e075c4319a49cf4c88825d78ce17.tar.gz
change X-Frame-Options to SAMEORIGIN
needed to allow sidekiq to load on background jobs tab
-rw-r--r--lib/support/nginx/gitlab-ssl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/support/nginx/gitlab-ssl b/lib/support/nginx/gitlab-ssl
index 8f94844d3f9..e3a3dc8a1da 100644
--- a/lib/support/nginx/gitlab-ssl
+++ b/lib/support/nginx/gitlab-ssl
@@ -81,7 +81,7 @@ server {
ssl_prefer_server_ciphers on;
add_header Strict-Transport-Security max-age=63072000;
- add_header X-Frame-Options DENY;
+ add_header X-Frame-Options SAMEORIGIN;
add_header X-Content-Type-Options nosniff;
## Individual nginx logs for this GitLab vhost