diff options
| author | 2019-01-20 09:52:57 +0100 | |
|---|---|---|
| committer | 2019-01-20 09:52:57 +0100 | |
| commit | bdc337d70a386cae954399e55bb128119f601128 (patch) | |
| tree | f1b90e9a2c028478e1b82325704ffdd943c4b3b6 /pysite/settings.py | |
| parent | Merge branch 'django' into django+add-logs-api. (diff) | |
| parent | Add an example `docker-compose.yml`. (diff) | |
Merge branch 'django' into django+add-logs-api
Diffstat (limited to 'pysite/settings.py')
| -rw-r--r-- | pysite/settings.py | 4 | 
1 files changed, 3 insertions, 1 deletions
| diff --git a/pysite/settings.py b/pysite/settings.py index c3373250..b27e2a41 100644 --- a/pysite/settings.py +++ b/pysite/settings.py @@ -72,7 +72,9 @@ INSTALLED_APPS = [      'django.contrib.messages',      'django.contrib.staticfiles', +    'crispy_forms',      'django_hosts', +    'django_filters',      'rest_framework',      'rest_framework.authtoken'  ] @@ -214,7 +216,7 @@ LOGGING = {                      # use `DEBUG` if we're running in debug mode but not                      # testing. Use `ERROR` if we're running tests, else                      # default to using `WARN`. -                    'DEBUG' +                    'INFO'                      if DEBUG and 'test' not in sys.argv                      else (                          'ERROR' | 
