From 44419239445b03801e1f7c0bb825bda080012c71 Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Thu, 11 Dec 2014 10:24:18 -0200
Subject: [PATCH] Using jQuery noconflict

---
 colab/proxy/gitlab/templates/proxy/gitlab.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/colab/proxy/gitlab/templates/proxy/gitlab.html b/colab/proxy/gitlab/templates/proxy/gitlab.html
index ef0865d..1d55f9f 100644
--- a/colab/proxy/gitlab/templates/proxy/gitlab.html
+++ b/colab/proxy/gitlab/templates/proxy/gitlab.html
@@ -33,12 +33,12 @@
 
 {% block head_js %}
 <script type="text/javascript">
-  $(function(){
+  jQuery(function(){
     // bootstrap.css forces .hide {display:none!important}, and this makes
     // gitlab .hide elements NEVER have a display:block, so
     // instead of editing bootstrap.css, we just removed '.hide' css class and
     // toggled 
-    $('.hide').removeClass('hide').css('display', 'none');
+    jQuery('.hide').removeClass('hide').css('display', 'none');
 
     // Hit the SSH clone button to select it by default
     jQuery(".git-clone-holder .btn:contains('SSH')").click()
--
libgit2 0.21.2