diff --git a/colab/proxy/gitlab/data_api.py b/colab/proxy/gitlab/data_api.py
index 35aee2c..aa92ee6 100644
--- a/colab/proxy/gitlab/data_api.py
+++ b/colab/proxy/gitlab/data_api.py
@@ -2,7 +2,6 @@
 import json
 import urllib
 import urllib2
-import urlparse
 
 from dateutil.parser import parse
 
@@ -22,8 +21,10 @@ class GitlabDataAPI(ProxyDataAPI):
         kwargs['private_token'] = proxy_config.get('private_token')
         params = urllib.urlencode(kwargs)
 
-        url = u'{}?{}'.format(path, params)
-        return urlparse.urljoin(upstream, url)
+        if upstream[-1] == '/':
+            upstream = upstream[:-1]
+
+        return u'{}{}?{}'.format(upstream, path, params)
 
     def fetchProjects(self):
         page = 1
--
libgit2 0.21.2