Download as
Browse Code »

Commit 82e3064463cb150cecd5ef26b62b38b190209d16

Authored by Sergio Oliveira
2 parents 954ff0cd 90385c1e

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

Conflicts:
	src/proxy/diazo/gitlab.xml
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
src/proxy/views.py
  Diff comments   View file @82e3064
... ... @@ -59,7 +59,7 @@ class JenkinsProxyView(ProxyView):
59 59 class GitlabProxyView(ProxyView):
60 60 base_url = settings.COLAB_GITLAB_URL
61 61 add_remote_user = settings.REVPROXY_ADD_REMOTE_USER
62   - diazo_theme_template = 'proxy/gitlab.html'
  62 + diazo_theme_template = 'base.html'
63 63 diazo_rules = os.path.join(DIAZO_RULES_DIR, 'gitlab.xml')
64 64 html5 = True
65 65  
... ...