Commit e8a5d79c authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'expose-pagination-headers' into 'master'

CORS: Whitelist pagination headers

Closes #28405

See merge request !9651
parents 929096d1 f9788bc1
---
title: 'CORS: Whitelist pagination headers'
merge_request: 9651
author: Robert Schilling
...@@ -120,7 +120,7 @@ module Gitlab ...@@ -120,7 +120,7 @@ module Gitlab
credentials: true, credentials: true,
headers: :any, headers: :any,
methods: :any, methods: :any,
expose: ['Link'] expose: ['Link', 'X-Total', 'X-Total-Pages', 'X-Per-Page', 'X-Page', 'X-Next-Page', 'X-Prev-Page']
end end
# Cross-origin requests must not have the session cookie available # Cross-origin requests must not have the session cookie available
...@@ -130,7 +130,7 @@ module Gitlab ...@@ -130,7 +130,7 @@ module Gitlab
credentials: false, credentials: false,
headers: :any, headers: :any,
methods: :any, methods: :any,
expose: ['Link'] expose: ['Link', 'X-Total', 'X-Total-Pages', 'X-Per-Page', 'X-Page', 'X-Next-Page', 'X-Prev-Page']
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment