Skip to content
Snippets Groups Projects
Commit 9990f876 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '94-move-allowed_hosts-into-local_settings-py' into 'master'

ALLOWED_HOSTS moved to local_settings

Closes #94

See merge request !48
parents d91527c2 afe7123c
No related branches found
No related tags found
1 merge request!48ALLOWED_HOSTS moved to local_settings
Pipeline #
...@@ -15,6 +15,8 @@ EMAIL_PORT = 25 ...@@ -15,6 +15,8 @@ EMAIL_PORT = 25
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
DEFAULT_FROM_EMAIL = 'prc-scheduling-admin@uni.lu' DEFAULT_FROM_EMAIL = 'prc-scheduling-admin@uni.lu'
ALLOWED_HOSTS = ['prc.parkinson.lu', 'localhost']
# Database # Database
# https://docs.djangoproject.com/en/1.10/ref/settings/#databases # https://docs.djangoproject.com/en/1.10/ref/settings/#databases
......
...@@ -18,8 +18,6 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) ...@@ -18,8 +18,6 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
# Quick-start development settings - unsuitable for production # Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/ # See https://docs.djangoproject.com/en/1.10/howto/deployment/checklist/
ALLOWED_HOSTS = ['prc.parkinson.lu', 'localhost']
DEBUG = True DEBUG = True
# Application definition # Application definition
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment