diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py index 52d9a3b59..3f4c85a4a 100644 --- a/netbox/netbox/settings.py +++ b/netbox/netbox/settings.py @@ -232,14 +232,6 @@ REST_FRAMEWORK = { } # Django debug toolbar -# Disable the templates panel by default due to a performance issue in Django 1.11; see -# https://github.com/jazzband/django-debug-toolbar/issues/910 -DEBUG_TOOLBAR_CONFIG = { - 'DISABLE_PANELS': [ - 'debug_toolbar.panels.redirects.RedirectsPanel', - 'debug_toolbar.panels.templates.TemplatesPanel', - ], -} INTERNAL_IPS = ( '127.0.0.1', '::1', diff --git a/requirements.txt b/requirements.txt index 20c1dff27..cdda3cf1d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,11 @@ -cffi>=1.8 -cryptography>=1.8 -Django>=1.11 -django-cors-headers>=2.0 -django-debug-toolbar>=1.7 -django-filter>=1.0.2 +Django>=1.11,<2.0 +django-cors-headers>=2.1 +django-debug-toolbar>=1.8 +django-filter>=1.0.4 django-mptt==0.8.7 django-rest-swagger>=2.1.0 -django-tables2>=1.7.0 -djangorestframework>=3.6.2 +django-tables2>=1.10.0 +djangorestframework>=3.6.4 graphviz>=0.6 Markdown>=2.6.7 natsort>=5.0.0 @@ -18,5 +16,4 @@ Pillow>=4.0.0 psycopg2>=2.7.3 py-gfm>=0.1.3 pycryptodome>=3.4.7 -sqlparse>=0.2 xmltodict>=0.10.2