summaryrefslogtreecommitdiff
path: root/lib/support/nginx/gitlab
diff options
context:
space:
mode:
authorGitLab <gitlab@localhost>2014-06-03 17:06:27 +0200
committerGitLab <gitlab@localhost>2014-06-03 17:06:27 +0200
commitfdcc5ddec1e599289e09aeef0c5fbc276abcc05c (patch)
tree456ab8841989f785dd252e294e3a4239bc832ed6 /lib/support/nginx/gitlab
parentf758438ed5de9e8ccf2d91131626610787470b00 (diff)
downloadgitlab-ce-fdcc5ddec1e599289e09aeef0c5fbc276abcc05c.tar.gz
Ensure sidekiq is displayed by setting X-Frame-Options.
Diffstat (limited to 'lib/support/nginx/gitlab')
-rw-r--r--lib/support/nginx/gitlab1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/support/nginx/gitlab b/lib/support/nginx/gitlab
index 98c91637390..36306eeb3a6 100644
--- a/lib/support/nginx/gitlab
+++ b/lib/support/nginx/gitlab
@@ -54,6 +54,7 @@ server {
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Frame-Options SAMEORIGIN;
proxy_pass http://gitlab;
}