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

GitLab
1 parent f758438e
Showing 2 changed files with 2 additions and 0 deletions Show diff stats
CHANGELOG
lib/support/nginx/gitlab
@@ -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;
   }
	@@ -13,6 +13,7 @@ v 7.0.0		@@ -13,6 +13,7 @@ v 7.0.0
13	- Group masters can create projects in group	13	- Group masters can create projects in group
14	- Deprecate ruby 1.9.3 support	14	- Deprecate ruby 1.9.3 support
15	- Only masters can rewrite/remove git tags	15	- Only masters can rewrite/remove git tags
		16	+ - Add X-Frame-Options SAMEORIGIN to Nginx config so Sidekiq admin is visible
16		17
17	v 6.9.2	18	v 6.9.2
18	- Revert the commit that broke the LDAP user filter	19	- Revert the commit that broke the LDAP user filter
	@@ -54,6 +54,7 @@ server {		@@ -54,6 +54,7 @@ server {
54	proxy_set_header Host $http_host;	54	proxy_set_header Host $http_host;
55	proxy_set_header X-Real-IP $remote_addr;	55	proxy_set_header X-Real-IP $remote_addr;
56	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;	56	proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
		57	+ proxy_set_header X-Frame-Options SAMEORIGIN;
57		58
58	proxy_pass http://gitlab;	59	proxy_pass http://gitlab;
59	}	60	}