Commit f694a7c2ff09b1d44dcc62876f4138d88677c3d4
1 parent
3f665768
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
| @@ -96,6 +96,8 @@ CACHES = { | @@ -96,6 +96,8 @@ CACHES = { | ||
| 96 | DATABASE_ROUTERS = ['colab.routers.TracRouter',] | 96 | DATABASE_ROUTERS = ['colab.routers.TracRouter',] |
| 97 | 97 | ||
| 98 | INSTALLED_APPS = INSTALLED_APPS + ( | 98 | INSTALLED_APPS = INSTALLED_APPS + ( |
| 99 | + # First app to provide AUTH_USER_MODEL to others | ||
| 100 | + 'accounts', | ||
| 99 | 101 | ||
| 100 | # Not standard apps | 102 | # Not standard apps |
| 101 | 'raven.contrib.django.raven_compat', | 103 | 'raven.contrib.django.raven_compat', |
| @@ -115,7 +117,6 @@ INSTALLED_APPS = INSTALLED_APPS + ( | @@ -115,7 +117,6 @@ INSTALLED_APPS = INSTALLED_APPS + ( | ||
| 115 | 'api', | 117 | 'api', |
| 116 | 'rss', | 118 | 'rss', |
| 117 | 'planet', | 119 | 'planet', |
| 118 | - 'accounts', | ||
| 119 | 'proxy', | 120 | 'proxy', |
| 120 | 'search', | 121 | 'search', |
| 121 | 'badger', | 122 | '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('', |