Merge branch 'master' into pyup-update-django-1.11.7-to-2.0

thraxil · Dec 3, 2017 · abb2196 · abb2196
2 parents aac8c3d + da7f407
commit abb2196
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/mithras/settings_docker.py b/mithras/settings_docker.py
@@ -14,5 +14,5 @@
         celery=False,
         INSTALLED_APPS=INSTALLED_APPS,
         STATIC_ROOT=STATIC_ROOT,
-        MIDDLEWARE_CLASSES=MIDDLEWARE_CLASSES,
+        MIDDLEWARE=MIDDLEWARE,
     ))
diff --git a/mithras/settings_shared.py b/mithras/settings_shared.py
@@ -40,7 +40,7 @@
     'bootstrap3',
 ]
 
-MIDDLEWARE_CLASSES += [ # noqa
+MIDDLEWARE += [ # noqa
     'django.contrib.messages.middleware.MessageMiddleware',
 ]
 

diff --git a/requirements.txt b/requirements.txt
@@ -45,4 +45,4 @@ django-expvar-cmdline==0.1.0
 django-expvar-psutil==0.1.0
 opbeat==3.5.3
 
-thraxilsettings==2.1.0
+thraxilsettings==3.0.0