From 7666d0458085fe0af4e3376d14f7c9997cd36a64 Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Thu, 12 Mar 2015 23:06:30 +0100
Subject: [PATCH] django-debug-toolbar now supports Django 1.8. Yay!

---
 src/pretix/settings.py | 4 ++--
 src/pretix/urls.py     | 9 ++++-----
 src/requirements.txt   | 4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/pretix/settings.py b/src/pretix/settings.py
index bd5d803b3b..d7706fb7b0 100644
--- a/src/pretix/settings.py
+++ b/src/pretix/settings.py
@@ -42,7 +42,7 @@ INSTALLED_APPS = (
     'pretix.presale',
     'compressor',
     'bootstrap3',
-    # 'debug_toolbar.apps.DebugToolbarConfig',
+    'debug_toolbar.apps.DebugToolbarConfig',
     'djangoformsetjs',
     'pretix.plugins.testdummy',
     'pretix.plugins.timerestriction',
@@ -56,7 +56,7 @@ MIDDLEWARE_CLASSES = (
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
-    # 'debug_toolbar.middleware.DebugToolbarMiddleware',
+    'debug_toolbar.middleware.DebugToolbarMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'pretix.control.middleware.PermissionMiddleware',
diff --git a/src/pretix/urls.py b/src/pretix/urls.py
index 936fc69283..5a67db51d7 100644
--- a/src/pretix/urls.py
+++ b/src/pretix/urls.py
@@ -14,11 +14,10 @@ urlpatterns = patterns('',
 )
 
 if settings.DEBUG:
-    pass
-    # import debug_toolbar
-    # urlpatterns += patterns('',
-    #     url(r'^__debug__/', include(debug_toolbar.urls)),
-    # )
+    import debug_toolbar
+    urlpatterns += patterns('',
+        url(r'^__debug__/', include(debug_toolbar.urls)),
+    )
 
 urlpatterns += patterns('',
     url(r'', include(pretix.presale.urls, namespace='presale'))
diff --git a/src/requirements.txt b/src/requirements.txt
index c58528c95f..ad57b5d073 100644
--- a/src/requirements.txt
+++ b/src/requirements.txt
@@ -1,5 +1,5 @@
 # Functional requirements
-Django==1.8b1
+Django==1.8b2
 pytz
 django-bootstrap3
 -e git+https://github.com/pretix/django-formset-js.git@master#egg=django-formset-js
@@ -17,7 +17,7 @@ lxml
 flufl.enum
 
 # Debugging requirements
-django-debug-toolbar
+django-debug-toolbar>=1.3.0
 
 # Testing requirements
 pyflakes