Merge branch 'update_puppet' of github.com:colab-community/colab into update_puppet

Sergio Oliveira
2 parents 9dffef70 269912c8
Showing 2 changed files with 3 additions and 2 deletions Show diff stats
src/colab/custom_settings.py
src/proxy/urls.py
@@ -89,6 +89,8 @@ CACHES = {
 DATABASE_ROUTERS = ['colab.routers.TracRouter',]
  
 INSTALLED_APPS = INSTALLED_APPS + (
+    # First app to provide  AUTH_USER_MODEL to others
+    'accounts',
  
     # Not standard apps
     'raven.contrib.django.raven_compat',
@@ -108,7 +110,6 @@ INSTALLED_APPS = INSTALLED_APPS + (
     'api',
     'rss',
     'planet',
-    'accounts',
     'proxy',
     'search',
     'badger',
  
 from django.conf.urls import patterns, include, url
  
-from .views import ProxyView, JenkinsProxyView, GitlabProxyView, RedmineProxyView 
+from .views import ProxyView, JenkinsProxyView, GitlabProxyView, RedmineProxyView, TracProxyView 
  
  
 urlpatterns = patterns('',
...	...	@@ -89,6 +89,8 @@ CACHES = {
89	89	DATABASE_ROUTERS = ['colab.routers.TracRouter',]
90	90
91	91	INSTALLED_APPS = INSTALLED_APPS + (
	92	+ # First app to provide AUTH_USER_MODEL to others
	93	+ 'accounts',
92	94
93	95	# Not standard apps
94	96	'raven.contrib.django.raven_compat',
...	...	@@ -108,7 +110,6 @@ INSTALLED_APPS = INSTALLED_APPS + (
108	110	'api',
109	111	'rss',
110	112	'planet',
111		- 'accounts',
112	113	'proxy',
113	114	'search',
114	115	'badger',
...	...
1	1
2	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	7	urlpatterns = patterns('',
...	...