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

Same origin header

Fixes #1313

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

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;
   }