Download as
Browse Code »

Commit 605dfc9c32f37c4462f8e5b876391a509bf1c6af

Authored by Dmitriy Zaporozhets
2 parents d042257a fdcc5dde
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Merge branch 'same-origin-header' into 'master' 

Same origin header

Fixes #1313
Showing 2 changed files with 2 additions and 0 deletions   Show diff stats
@@ -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
lib/support/nginx/gitlab
  Diff comments   View file @605dfc9
@@ -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 }