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

Conflicts: src/proxy/diazo/gitlab.xml

Merge branch 'spb-dev' of github.com:colab-community/colab into spb-dev
Conflicts: src/proxy/diazo/gitlab.xml
Sergio Oliveira
2 parents 954ff0cd 90385c1e
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
src/proxy/views.py
@@ -59,7 +59,7 @@ class JenkinsProxyView(ProxyView):
 class GitlabProxyView(ProxyView):
     base_url = settings.COLAB_GITLAB_URL
     add_remote_user = settings.REVPROXY_ADD_REMOTE_USER
-    diazo_theme_template = 'proxy/gitlab.html'
+    diazo_theme_template = 'base.html'
     diazo_rules = os.path.join(DIAZO_RULES_DIR, 'gitlab.xml')
     html5 = True
	@@ -59,7 +59,7 @@ class JenkinsProxyView(ProxyView):		@@ -59,7 +59,7 @@ class JenkinsProxyView(ProxyView):
59	class GitlabProxyView(ProxyView):	59	class GitlabProxyView(ProxyView):
60	base_url = settings.COLAB_GITLAB_URL	60	base_url = settings.COLAB_GITLAB_URL
61	add_remote_user = settings.REVPROXY_ADD_REMOTE_USER	61	add_remote_user = settings.REVPROXY_ADD_REMOTE_USER
62	- diazo_theme_template = 'proxy/gitlab.html'	62	+ diazo_theme_template = 'base.html'
63	diazo_rules = os.path.join(DIAZO_RULES_DIR, 'gitlab.xml')	63	diazo_rules = os.path.join(DIAZO_RULES_DIR, 'gitlab.xml')
64	html5 = True	64	html5 = True
65		65