JonathanWilliamson/bconla
0
0
Fork 1
forked from infrastructure/conference-website
Code Issues Pull Requests Activity

Adding placeholder text in the presentation proposal form #1

Closed
Jason van Gumster wants to merge 16 commits from (deleted):proposal_placeholders into staging
pull from: (deleted):proposal_placeholders
merge into: JonathanWilliamson:staging

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 1 Commits 16 Files Changed 5 +1 -3
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d41962b1a3 - Show all commits

4
conference/settings_common.py
View File

@ -1,6 +1,7 @@
from typing import List from typing import List
import os import os
import pathlib import pathlib
import dj_database_url
from sentry_sdk.integrations.django import DjangoIntegration from sentry_sdk.integrations.django import DjangoIntegration
import sentry_sdk import sentry_sdk
@ -117,9 +118,6 @@ DATABASES = {
} }
} }
db_from_env = dj_database_url.config(conn_max_age=600)
DATABASES['default'].update(db_from_env)
# Password validation # Password validation
# https://docs.djangoproject.com/en/2.2/ref/settings/#auth-password-validators # https://docs.djangoproject.com/en/2.2/ref/settings/#auth-password-validators