Skip to content

Commit

Permalink
Merge pull request #372 from WISVCH/dependabot/pip/djangorestframewor…
Browse files Browse the repository at this point in the history
…k-3.15.2

Bump djangorestframework from 3.14.0 to 3.15.2
  • Loading branch information
JoepdeJong authored Aug 12, 2024
2 parents 1638a26 + 13d081c commit 3d04f31
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 19 deletions.
1 change: 1 addition & 0 deletions ci.env
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ DATABASE_URL=postgres://[email protected]/dienst2?atomic_requests=True
CACHE_URL=dummycache://
GOOGLE_SERVICE_ACCOUNT_DELEGATED_USER="[email protected]"
GOOGLE_IAP_AUDIENCE=
CSRF_TRUSTED_ORIGINS=http://localhost:8000
1 change: 1 addition & 0 deletions dev.env
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ CACHE_URL=dummycache://
INTERNAL_IPS=127.0.0.1,172.18.0.1
GOOGLE_SERVICE_ACCOUNT_DELEGATED_USER="[email protected]"
GOOGLE_IAP_AUDIENCE=/projects/966138216790/apps/wisvch
CSRF_TRUSTED_ORIGINS=http://localhost:8000
3 changes: 3 additions & 0 deletions dienst2/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@

ALLOWED_HOSTS = env.list("ALLOWED_HOSTS", default=["*"])
INTERNAL_IPS = env.list("INTERNAL_IPS", default="")
CSRF_TRUSTED_ORIGINS = env.list(
"CSRF_TRUSTED_ORIGINS", default=["https://dienst2.ch.tudelft.nl"]
)
SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https")

DATABASES = {"default": env.db()}
Expand Down
24 changes: 6 additions & 18 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ whitenoise = "^6.5.0"
django-reversion = "^5.0.4"
django-reversion-compare = "^0.16.2"
django-import-export = "^3.2.0"
djangorestframework = "^3.14.0"
djangorestframework = "^3.15.2"
django-filter = "^23.2"
django-health-check = "^3.17.0"
django-bootstrap3 = "^23.4"
Expand Down

0 comments on commit 3d04f31

Please sign in to comment.