summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-02-08 16:54:12 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-02-08 16:54:12 +0000
commit9104dda057cc7f2c65f07e509013f3cff10db590 (patch)
tree74af16bfb1bc2afc23fb385727fda39b0f211862 /app/controllers
parent2b77b43bec240eb5ed2c5422eb810df5eb8edfcc (diff)
downloadgitlab-ce-9104dda057cc7f2c65f07e509013f3cff10db590.tar.gz
Add latest changes from gitlab-org/gitlab@14-7-stable-ee
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/application_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d3ecbdcc1f6..8e758c669db 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -273,7 +273,7 @@ class ApplicationController < ActionController::Base
end
def default_headers
- headers['X-Frame-Options'] = 'DENY'
+ headers['X-Frame-Options'] = 'SAMEORIGIN'
headers['X-XSS-Protection'] = '1; mode=block'
headers['X-UA-Compatible'] = 'IE=edge'
headers['X-Content-Type-Options'] = 'nosniff'