summaryrefslogtreecommitdiff
path: root/lib/api/helpers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-28 13:31:50 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-28 13:31:50 +0000
commit1e8ef329735f06d3b3cfe1966b79fe55eff21f30 (patch)
tree0c03cc2618813b9eafafd2289cfbac16fd2c2766 /lib/api/helpers
parentefed756aa7fbe80f589edb613eda69f6c7a9a47a (diff)
downloadgitlab-ce-1e8ef329735f06d3b3cfe1966b79fe55eff21f30.tar.gz
Add latest changes from gitlab-org/security/gitlab@12-7-stable-ee
Diffstat (limited to 'lib/api/helpers')
-rw-r--r--lib/api/helpers/headers_helpers.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/api/helpers/headers_helpers.rb b/lib/api/helpers/headers_helpers.rb
index 7553af9d156..908c57bb04e 100644
--- a/lib/api/helpers/headers_helpers.rb
+++ b/lib/api/helpers/headers_helpers.rb
@@ -3,6 +3,8 @@
module API
module Helpers
module HeadersHelpers
+ include Gitlab::NoCacheHeaders
+
def set_http_headers(header_data)
header_data.each do |key, value|
if value.is_a?(Enumerable)
@@ -12,6 +14,12 @@ module API
header "X-Gitlab-#{key.to_s.split('_').collect(&:capitalize).join('-')}", value.to_s
end
end
+
+ def no_cache_headers
+ DEFAULT_GITLAB_NO_CACHE_HEADERS.each do |k, v|
+ header k, v
+ end
+ end
end
end
end