External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 18:09:57 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9889 from ryanpetrello/cors-allow-list

Browse Source 
update django-cors-headers and switch to inclusive settings name

see: #9177

Reviewed-by: Bianca Henderson <beeankha@gmail.com>
Reviewed-by: Christian Adams <rooftopcellist@gmail.com>
This commit is contained in:
softwarefactory-project-zuul[bot] 2021-04-13 16:38:15 +00:00 committed by GitHub
commit cd372e4c74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/cors.md
View File

@ -6,7 +6,7 @@ AWX supports custom CORS headers via the Django CORS Middleware
To define CORS-specific settings, add them to ``/etc/tower/conf.d/cors.py``:
```python
CORS_ORIGIN_WHITELIST = (
CORS_ALLOWED_ORIGINS = (
'hostname.example.com',
'127.0.0.1:9000'
)

2
requirements/requirements.in
View File

@ -12,7 +12,7 @@ daphne
distro
django==2.2.16 # see UPGRADE BLOCKERs
django-auth-ldap
django-cors-headers
django-cors-headers>=3.5.0
django-crum
django-extensions>=2.2.9 # https://github.com/ansible/awx/pull/6441
django-guid==2.2.0 # pinned to match Django 2.2

11
requirements/requirements.txt
View File

@ -70,9 +70,8 @@ cryptography==2.9.2
# pyopenssl
# service-identity
# social-auth-core
Cython==0.29.22
# via
# -r /awx_devel/requirements/requirements.in
cython==0.29.22
# via -r /awx_devel/requirements/requirements.in
daphne==2.4.1
# via
# -r /awx_devel/requirements/requirements.in
@ -88,7 +87,7 @@ distro==1.5.0
# via -r /awx_devel/requirements/requirements.in
django-auth-ldap==2.1.0
# via -r /awx_devel/requirements/requirements.in
django-cors-headers==3.2.1
django-cors-headers==3.7.0
# via -r /awx_devel/requirements/requirements.in
django-crum==0.7.5
# via -r /awx_devel/requirements/requirements.in
@ -395,6 +394,8 @@ websocket-client==0.57.0
# via
# kubernetes
# slackclient
wheel==0.36.2
# via -r /awx_devel/requirements/requirements.in
xmlsec==1.3.3
# via python3-saml
yarl==1.4.2
@ -415,5 +416,3 @@ setuptools==41.6.0
# markdown
# python-daemon
# zope.interface
wheel==0.36.2
# via -r /awx_devel/requirements/requirements.in