summaryrefslogtreecommitdiff
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-12-29 18:09:53 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-12-29 18:09:53 +0000
commit2dcdb22ddf7f36f4f9581737bc4e639655e9f178 (patch)
treeeb90d2340f7da8c9803d51025bb1ee8498887c37 /app/controllers/application_controller.rb
parentdbdfb3e36dd5ed7b66a029cdd3202d6d7da5ae55 (diff)
downloadgitlab-ce-2dcdb22ddf7f36f4f9581737bc4e639655e9f178.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e64d3110c3a..36aae42e21f 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -24,6 +24,7 @@ class ApplicationController < ActionController::Base
include ::Gitlab::EndpointAttributes
include FlocOptOut
include CheckRateLimit
+ extend ContentSecurityPolicyPatch
before_action :limit_session_time, if: -> { !current_user }
before_action :authenticate_user!, except: [:route_not_found]