Commit 269912c8ede318a8ae92dde4e65f79000777e92e
Committed by
Gust
Gust
1 parent
82cfac49
Exists in
master
and in
39 other branches
Fixing import error and APP order
-Import error of ProxyTracView -Set accounts app as first as it provides the AUTH_USER_MODEL
Showing
2 changed files
with
3 additions
and
2 deletions
Show diff stats
src/colab/custom_settings.py
| @@ -89,6 +89,8 @@ CACHES = { | @@ -89,6 +89,8 @@ CACHES = { | ||
| 89 | DATABASE_ROUTERS = ['colab.routers.TracRouter',] | 89 | DATABASE_ROUTERS = ['colab.routers.TracRouter',] |
| 90 | 90 | ||
| 91 | INSTALLED_APPS = INSTALLED_APPS + ( | 91 | INSTALLED_APPS = INSTALLED_APPS + ( |
| 92 | + # First app to provide AUTH_USER_MODEL to others | ||
| 93 | + 'accounts', | ||
| 92 | 94 | ||
| 93 | # Not standard apps | 95 | # Not standard apps |
| 94 | 'raven.contrib.django.raven_compat', | 96 | 'raven.contrib.django.raven_compat', |
| @@ -108,7 +110,6 @@ INSTALLED_APPS = INSTALLED_APPS + ( | @@ -108,7 +110,6 @@ INSTALLED_APPS = INSTALLED_APPS + ( | ||
| 108 | 'api', | 110 | 'api', |
| 109 | 'rss', | 111 | 'rss', |
| 110 | 'planet', | 112 | 'planet', |
| 111 | - 'accounts', | ||
| 112 | 'proxy', | 113 | 'proxy', |
| 113 | 'search', | 114 | 'search', |
| 114 | 'badger', | 115 | 'badger', |
src/proxy/urls.py
| 1 | 1 | ||
| 2 | from django.conf.urls import patterns, include, url | 2 | from django.conf.urls import patterns, include, url |
| 3 | 3 | ||
| 4 | -from .views import ProxyView, JenkinsProxyView, GitlabProxyView, RedmineProxyView | 4 | +from .views import ProxyView, JenkinsProxyView, GitlabProxyView, RedmineProxyView, TracProxyView |
| 5 | 5 | ||
| 6 | 6 | ||
| 7 | urlpatterns = patterns('', | 7 | urlpatterns = patterns('', |