Skip to content
Snippets Groups Projects
Commit e4001da4 authored by florimondmanca's avatar florimondmanca
Browse files

Merge branch 'master' of https://github.com/oser-cs/oser-showcase-backend

parents e09196c9 f4dd4ce9
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
project/project/settings/common.py
+ 4
− 6
View file @ e4001da4
...@@ -112,12 +112,10 @@ CORS_ORIGIN_REGEX_WHITELIST = ( ...@@ -112,12 +112,10 @@ CORS_ORIGIN_REGEX_WHITELIST = (
# Allow local hosts on any port # Allow local hosts on any port
r'^(https?://)?localhost(:\d+)?$', r'^(https?://)?localhost(:\d+)?$',
r'^(https?://)?127\.0\.0\.1(:\d+)?$', r'^(https?://)?127\.0\.0\.1(:\d+)?$',
# Allow hosts such as: # Allow any app hosted on Heroku
# - https://oser-cs.herokuapp.com r'^(https?://)?(.+\.)?herokuapp\.com$',
# - https://oser-frontend-dev.herokuapp.com # Allow any app on *oser-cs.fr
# (but also https://unknown.herokuapp.com...) r'^(https?://)?(.+\.)?oser-cs\.fr$',
# Essentially allows any frontend hosted on Heroku to send CORS requests.
r'^(https?://)?(.+\.)?herokuapp\.com$'
) )
X_FRAME_OPTIONS = 'DENY' # refuse to serve in an <iframe> X_FRAME_OPTIONS = 'DENY' # refuse to serve in an <iframe>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment