From fb583bf354f9d6c974f849c2e2423c265b9cbced Mon Sep 17 00:00:00 2001
From: Eric Holscher <eric@ericholscher.com>
Date: Wed, 27 Apr 2016 10:36:33 -0700
Subject: [PATCH] Re-enable django_extensions always. (#2169)

Also removes some random old commented out stuff from settings.
---
 readthedocs/settings/base.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/readthedocs/settings/base.py b/readthedocs/settings/base.py
index bf74ca0be..a80a5df80 100644
--- a/readthedocs/settings/base.py
+++ b/readthedocs/settings/base.py
@@ -78,6 +78,7 @@ class CommunityBaseSettings(Settings):
             'textclassifier',
             'annoying',
             'django_countries',
+            'django_extensions',
 
             # Celery bits
             'djcelery',
@@ -110,8 +111,6 @@ class CommunityBaseSettings(Settings):
             'allauth.socialaccount.providers.bitbucket',
             'allauth.socialaccount.providers.bitbucket_oauth2',
         ]
-        if self.DEBUG:
-            apps.append('django_extensions')
         return apps
 
     TEMPLATE_LOADERS = (
@@ -129,12 +128,9 @@ class CommunityBaseSettings(Settings):
         'django.contrib.auth.middleware.AuthenticationMiddleware',
         'django.contrib.messages.middleware.MessageMiddleware',
         'pagination.middleware.PaginationMiddleware',
-        # Hack
-        # 'core.underscore_middleware.UnderscoreMiddleware',
         'readthedocs.core.middleware.SubdomainMiddleware',
         'readthedocs.core.middleware.SingleVersionMiddleware',
         'corsheaders.middleware.CorsMiddleware',
-        # 'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
     )
 
     AUTHENTICATION_BACKENDS = (