Commit fdcc5dde authored by GitLab's avatar GitLab

Ensure sidekiq is displayed by setting X-Frame-Options.

parent f758438e
......@@ -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
......
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment