External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Shift Django to 1.6.x (>= 1.6.7).

Browse Source
This commit is contained in:
Luke Sneeringer
2014-09-10 12:17:35 -05:00
parent fbd17ede7a
commit 3267a988f8
13 changed files with 142 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/settings/defaults.py
View File

@@ -32,6 +32,7 @@ DATABASES = {
'NAME': os.path.join(BASE_DIR, 'awx.sqlite3'),
# Test database cannot be :memory: for celery/inventory tests to work.
'TEST_NAME': os.path.join(BASE_DIR, 'awx_test.sqlite3'),
'ATOMIC_REQUESTS': True,
}
}
@@ -114,8 +115,6 @@ TEMPLATE_CONTEXT_PROCESSORS += (
)
MIDDLEWARE_CLASSES += (
'django.middleware.transaction.TransactionMiddleware',
# Middleware loaded after this point will be subject to transactions.
'awx.main.middleware.ActivityStreamMiddleware',
'crum.CurrentRequestUserMiddleware',
)
@@ -238,13 +237,6 @@ EMAIL_USE_TLS = False
try:
import debug_toolbar
INSTALLED_APPS += ('debug_toolbar',)
# Add debug toolbar middleware before Transaction middleware.
new_mc = []
for mc in MIDDLEWARE_CLASSES:
if mc == 'django.middleware.transaction.TransactionMiddleware':
new_mc.append('debug_toolbar.middleware.DebugToolbarMiddleware')
new_mc.append(mc)
MIDDLEWARE_CLASSES = tuple(new_mc)
except ImportError:
pass