diff options
| author | GitLab <gitlab@localhost> | 2014-06-03 17:06:27 +0200 |
|---|---|---|
| committer | GitLab <gitlab@localhost> | 2014-06-03 17:06:27 +0200 |
| commit | fdcc5ddec1e599289e09aeef0c5fbc276abcc05c (patch) | |
| tree | 456ab8841989f785dd252e294e3a4239bc832ed6 | |
| parent | f758438ed5de9e8ccf2d91131626610787470b00 (diff) | |
| download | gitlab-ce-fdcc5ddec1e599289e09aeef0c5fbc276abcc05c.tar.gz | |
Ensure sidekiq is displayed by setting X-Frame-Options.
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/support/nginx/gitlab | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 97d1299bae6..306ff4d340e 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 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; } |