GitLab Integration

.flake8

@@ -1,3 +1,3 @@
 [flake8]
-ignore = E125,D100,D101,D102,D105,D200,D211,P101,FI15,FI16,FI12,FI11,FI17,FI50,FI53,FI54
+ignore = E125,D100,D101,D102,D103,D105,D107,D200,D202,D211,P101,FI15,FI16,FI12,FI11,FI17,FI50,FI53,FI54,MQ101,T000
 max-line-length = 80

.isort.cfg

@@ -3,8 +3,6 @@ line_length=80
 indent='    '
 multi_line_output=4
 default_section=FIRSTPARTY
-known_readthedocs=readthedocs
-known_readthedocsinc=readthedocsinc
-known_third_party=celery,stripe,requests,pytz,builtins,django,annoying
+known_third_party=celery,stripe,requests,pytz,builtins,django,annoying,mock,allauth,oauthlib,requests_oauthlib
 sections=FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
 add_imports=from __future__ import division, from __future__ import print_function, from __future__ import unicode_literals

.pre-commit-config.yaml

@@ -26,6 +26,7 @@ repos:
       'flake8-string-format',
       'flake8-tidy-imports',
       'flake8-todo']
+      exclude: 'test_oauth.py'
     - id: trailing-whitespace
 
 - repo: [email protected]:pre-commit/mirrors-yapf.git

docs/features.rst

@@ -13,7 +13,7 @@ More information can be found in the :doc:`vcs` page.
 Auto-updating
 -------------
 
-The :doc:`webhooks` page talks about the different ways you can ping RTD to let us know your project has been updated. We have official support for GitHub, and anywhere else we have a generic post-commit hook that allows you to POST to a URL to get your documentation built.
+The :doc:`webhooks` page talks about the different ways you can ping RTD to let us know your project has been updated. We have official support for GitHub, Bitbucket and GitLab, and anywhere else we have a generic post-commit hook that allows you to POST to a URL to get your documentation built.
 
 Internationalization
 --------------------

docs/webhooks.rst

@@ -9,7 +9,8 @@ receive a webhook notification, we determine if the change is related to an
 active version for your project, and if it is, a build is triggered for that
 version.
 
-.. _integration-detail:
+GitHub
+------
 
 Webhook Integrations
 --------------------
@@ -51,7 +52,7 @@ GitHub
 .. note:: The webhook secret is not yet respected
 
 Bitbucket
-~~~~~~~~~
+---------
 
 * Go to the **Settings** page for your project
 * Click **Webhooks** and then **Add webhook**
@@ -61,13 +62,13 @@ Bitbucket
 * Finish by clicking **Save**
 
 GitLab
-~~~~~~
+------
 
 * Go to the **Settings** page for your project
 * Click **Integrations**
 * For **URL**, use the URL of the integration on Read the Docs, found on the
   :ref:`integration detail page <integration-detail>` page
-* Leave the default **Push events** selected
+* Leave the default **Push events** selected and mark **Tag push events** also
 * Finish by clicking **Add Webhook**
 
 Using the generic API integration

media/css/core.css

@@ -479,7 +479,7 @@ p.build-failure { font-size: .8em; color: #dc1020; margin: 0 0 3px; }
 p.build-missing { font-size: .8em; color: #9d9a55; margin: 0 0 3px; }
 
 .navigable .profile_image { position:relative; left:-8px; top:-1px; width:184px; overflow:hidden; }
-.navigable .profile_image img { border-radius:5px; } 
+.navigable .profile_image img { border-radius:5px; }
 
 .profile #content { padding-top:8px; }
 /* build page */
@@ -551,7 +551,7 @@ p.build-missing { font-size: .8em; color: #9d9a55; margin: 0 0 3px; }
 .navigable > ul > li.active:after { content:"•"; position:absolute; right:8px; top:6px; font-size:1.2em; color:#465158; }
 
 .navigable > ul > li > a:hover { background:#E8ECEF; }
-.navigable > div { width:600px; float: left; padding-top:4px; } 
+.navigable > div { width:600px; float: left; padding-top:4px; }
 
 /* autocomplete */
 
@@ -696,6 +696,12 @@ a.socialaccount-provider.github:before {
     content: "\f09b";
 }
 
+div.project-import-remote form.import-connect-gitlab button:before,
+a.socialaccount-provider.gitlab:before {
+    font-family: FontAwesome;
+    content: "\f1d3";
+}
+
 div.project-import-remote form.import-connect-bitbucket button:before,
 a.socialaccount-provider.bitbucket:before,
 a.socialaccount-provider.bitbucket_oauth2:before {
@@ -934,7 +940,7 @@ span.build-state.build-state-failing { color: #a55; }
 
 .edit { cursor: pointer; -webkit-user-select: none; overflow:hidden; position:relative; }
 .edit { background:url(../images/edit.png) no-repeat; display:block; width:16px; height:16px; background-size:100% 100%; }
-.edit > span {text-indent:-9999em; text-direction:ltr; display:block; } 
+.edit > span {text-indent:-9999em; text-direction:ltr; display:block; }
 body .edit-toggle { display: none; }
 
 .edit-input { display: none; }
@@ -1018,50 +1024,50 @@ select.dropdown { display: none; }
 }
 
     /* CHART LISTS */
-    .chartlist { 
-      float: left; 
-      border-top: 1px solid #EEE; 
+    .chartlist {
+      float: left;
+      border-top: 1px solid #EEE;
       width: 15em;
     }
-    .chartlist li { 
+    .chartlist li {
       position: relative;
-      display: block;  
-      border-bottom: 1px solid #EEE; 
+      display: block;
+      border-bottom: 1px solid #EEE;
       _zoom: 1;
     }
-    .chartlist li a { 
-      display: block; 
+    .chartlist li a {
+      display: block;
       padding: 0.4em 4.5em 0.4em 0.5em;
-      position: relative; 
-      z-index: 2; 
+      position: relative;
+      z-index: 2;
     }
-    .chartlist .count { 
-      display: block; 
-      position: absolute; 
-      top: 0; 
-      right: 0; 
-      margin: 0 0.3em; 
-      text-align: right; 
-      color: #999; 
-      font-weight: bold; 
-      font-size: 0.875em; 
-      line-height: 2em; 
-      z-index: 5; 
+    .chartlist .count {
+      display: block;
+      position: absolute;
+      top: 0;
+      right: 0;
+      margin: 0 0.3em;
+      text-align: right;
+      color: #999;
+      font-weight: bold;
+      font-size: 0.875em;
+      line-height: 2em;
+      z-index: 5;
     }
-    .chartlist .index { 
-      display: block; 
-      position: absolute; 
-      top: 0; 
-      left: 0; 
-      height: 100%; 
-      background: #B8E4F5; 
-      text-indent: -9999px; 
-      overflow: hidden; 
+    .chartlist .index {
+      display: block;
+      position: absolute;
+      top: 0;
+      left: 0;
+      height: 100%;
+      background: #B8E4F5;
+      text-indent: -9999px;
+      overflow: hidden;
       line-height: 2em;
-      z-index: 1; 
+      z-index: 1;
     }
-    .chartlist li:hover { 
-      background: #EFEFEF; 
+    .chartlist li:hover {
+      background: #EFEFEF;
     }
 
 

readthedocs/builds/utils.py

@@ -1,8 +1,10 @@
+# -*- coding: utf-8 -*-
 """Utilities for the builds app."""
 
-from __future__ import absolute_import
-import re
+from __future__ import (
+    absolute_import, division, print_function, unicode_literals)
 
+import re
 
 GH_REGEXS = [
     re.compile('github.com/(.+)/(.+)(?:\.git){1}'),
@@ -16,6 +18,14 @@
     re.compile('bitbucket.org:(.+)/(.+)\.git'),
 ]
 
+# TODO: I think this can be different than `gitlab.com`
+# self.adapter.provider_base_url
+GL_REGEXS = [
+    re.compile('gitlab.com/(.+)/(.+)(?:\.git){1}'),
+    re.compile('gitlab.com/(.+)/(.+)'),
+    re.compile('gitlab.com:(.+)/(.+)\.git'),
+]
+
 
 def get_github_username_repo(url):
     if 'github' in url:
@@ -33,3 +43,12 @@ def get_bitbucket_username_repo(url=None):
             if match:
                 return match.groups()
     return (None, None)
+
+
+def get_gitlab_username_repo(url=None):
+    if 'gitlab' in url:
+        for regex in GL_REGEXS:
+            match = regex.search(url)
+            if match:
+                return match.groups()
+    return (None, None)

readthedocs/oauth/services/__init__.py

@@ -1,8 +1,11 @@
-"""Conditional classes for OAuth services"""
+# -*- coding: utf-8 -*-
+"""Conditional classes for OAuth services."""
+
+from __future__ import (
+    absolute_import, division, print_function, unicode_literals)
 
-from __future__ import absolute_import
 from readthedocs.core.utils.extend import SettingsOverrideObject
-from readthedocs.oauth.services import github, bitbucket
+from readthedocs.oauth.services import bitbucket, github, gitlab
 
 
 class GitHubService(SettingsOverrideObject):
@@ -15,4 +18,9 @@ class BitbucketService(SettingsOverrideObject):
     _override_setting = 'OAUTH_BITBUCKET_SERVICE'
 
 
-registry = [GitHubService, BitbucketService]
+class GitLabService(SettingsOverrideObject):
+    _default_class = gitlab.GitLabService
+    _override_setting = 'OAUTH_GITLAB_SERVICE'
+
+
+registry = [GitHubService, BitbucketService, GitLabService]