From fdcc5ddec1e599289e09aeef0c5fbc276abcc05c Mon Sep 17 00:00:00 2001
From: GitLab <gitlab@localhost>
Date: Tue, 3 Jun 2014 17:06:27 +0200
Subject: [PATCH] Ensure sidekiq is displayed by setting X-Frame-Options.
---
CHANGELOG | 1 +
lib/support/nginx/gitlab | 1 +
2 files changed, 2 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index 97d1299bae6a2..306ff4d340e5c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,7 @@ v 7.0.0
- Group masters can create projects in group
- Deprecate ruby 1.9.3 support
- Only masters can rewrite/remove git tags
+ - Add X-Frame-Options SAMEORIGIN to Nginx config so Sidekiq admin is visible
v 6.9.2
- Revert the commit that broke the LDAP user filter
diff --git a/lib/support/nginx/gitlab b/lib/support/nginx/gitlab
index 98c916373909f..36306eeb3a687 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;
}
--
GitLab