cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2025-01-23 15:54:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'make-settings-consistent-w-req' of https://github.com/statwonk/cookiecutter-django into statwonk-make-settings-consistent-w-req

Browse Source
This commit is contained in:
Daniel Roy Greenfeld 2017-02-13 10:48:10 -08:00
commit 9a837171b6
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
{{cookiecutter.project_slug}}/config/settings/common.py → {{cookiecutter.project_slug}}/config/settings/base.py
View File

2
{{cookiecutter.project_slug}}/config/settings/local.py
View File

@ -14,7 +14,7 @@ Local settings
import socket import socket
import os import os
from .common import * # noqa from .base import * # noqa
# DEBUG # DEBUG
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------

2
{{cookiecutter.project_slug}}/config/settings/production.py
View File

@ -20,7 +20,7 @@ from django.utils import six
import logging import logging
{% endif %} {% endif %}
from .common import * # noqa from .base import * # noqa
# SECRET CONFIGURATION # SECRET CONFIGURATION
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------

2
{{cookiecutter.project_slug}}/config/settings/test.py
View File

@ -5,7 +5,7 @@ Test settings
- Used to run tests fast on the continuous integration server and locally - Used to run tests fast on the continuous integration server and locally
''' '''
from .common import * # noqa from .base import * # noqa
# DEBUG # DEBUG