Merge branch 'master' into share-doctree-between-builders

Author: stsewd

Diff for: docs/faq.rst

@@ -21,6 +21,9 @@ You can delete and re-create the project with the proper name to get a new slug,
 but you really shouldn't do this if you have existing inbound links,
 as it `breaks the internet <http://www.w3.org/Provider/Style/URI.html>`_.
 
+If that isn't enough, you can ask to team to do this by `creating an issue <https://github.com/rtfd/readthedocs.org/issues/new>`__.
+
+
 How do I change the version slug of my project?
 -----------------------------------------------
 

Diff for: docs/install.rst

@@ -30,14 +30,14 @@ In order to get all the dependencies successfully installed,
 you need these libraries.
 
 .. tabs::
-   
+
    .. tab:: Mac OS
 
       If you are having trouble on OS X Mavericks
       (or possibly other versions of OS X) with building ``lxml``,
       you probably might need to use Homebrew_ to ``brew install libxml2``,
       and invoke the install with::
-      
+
           CFLAGS=-I/usr/local/opt/libxml2/include/libxml2 \
           LDFLAGS=-L/usr/local/opt/libxml2/lib \
           pip install -r requirements.txt
@@ -51,7 +51,7 @@ you need these libraries.
          sudo apt-get install libxml2-dev libxslt1-dev zlib1g-dev
 
       If you don't have redis installed yet, you can do it with::
-         
+
          sudo apt-get install redis-server
 
    .. tab:: CentOS/RHEL 7
@@ -79,7 +79,7 @@ Get and run Read the Docs
 
 Clone the repository somewhere on your disk and enter to the repository::
 
-    git clone https://github.com/rtfd/readthedocs.org.git
+    git clone --recurse-submodules https://github.com/rtfd/readthedocs.org.git
     cd readthedocs.org
 
 Create a virtual environment and activate it::
@@ -163,7 +163,7 @@ See our :doc:`/intro/import-guide` page to learn more.
 Further steps
 -------------
 
-By now you can trigger builds on your local environment, 
+By now you can trigger builds on your local environment,
 to encapsulate the build process inside a Docker container,
 see :doc:`development/buildenvironments`.
 

Diff for: docs/versions.rst

@@ -9,6 +9,8 @@ This will point at the default branch for your VCS control: ``master``, ``defaul
 We also create a ``stable`` version,
 if your project has any tagged releases.
 ``stable`` will be automatically kept up to date to point at your highest version.
+If you want a custom ``stable`` version,
+create either a tag or branch in your project with that name.
 
 How we envision versions working
 --------------------------------

Diff for: readthedocs/core/migrations/0006_remove_userprofile_allow_email.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-03-01 17:30
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0005_migrate-old-passwords'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='userprofile',
+            name='allow_email',
+        ),
+    ]

Diff for: readthedocs/core/models.py

@@ -32,11 +32,6 @@ class UserProfile(models.Model):
         help_text=_('If unchecked, you will still see community ads.'),
         default=True,
     )
-    allow_email = models.BooleanField(
-        _('Allow email'),
-        help_text=_('Show your email on VCS contributions.'),
-        default=True,
-    )
 
     def __str__(self):
         return (
@@ -49,19 +44,3 @@ def get_absolute_url(self):
             'profiles_profile_detail',
             kwargs={'username': self.user.username},
         )
-
-    def get_contribution_details(self):
-        """
-        Get the line to put into commits to attribute the author.
-
-        Returns a tuple (name, email)
-        """
-        if self.user.first_name and self.user.last_name:
-            name = '{} {}'.format(self.user.first_name, self.user.last_name)
-        else:
-            name = self.user.username
-        if self.allow_email:
-            email = self.user.email
-        else:
-            email = STANDARD_EMAIL
-        return (name, email)

Diff for: readthedocs/restapi/urls.py

@@ -35,7 +35,7 @@
 router.register(r'project', ProjectViewSet, basename='project')
 router.register(r'notification', NotificationViewSet, basename='emailhook')
 router.register(r'domain', DomainViewSet, basename='domain')
-router.register(r'sphinx_domains', SphinxDomainAPIView, base_name='sphinxdomain')
+router.register(r'sphinx_domains', SphinxDomainAPIView, basename='sphinxdomain')
 router.register(
     r'remote/org',
     RemoteOrganizationViewSet,

Diff for: readthedocs/sphinx_domains/api.py

@@ -33,7 +33,7 @@ class SphinxDomainAPIView(UserSelectViewSet):  # pylint: disable=too-many-ancest
     model = SphinxDomain
     serializer_class = SphinxDomainSerializer
     admin_serializer_class = SphinxDomainAdminSerializer
-    filter_fields = (
+    filterset_fields = (
         'project__slug',
         'version__slug',
         'domain',

Diff for: readthedocs/templates/core/project_list_detailed.html

@@ -29,24 +29,15 @@
     <span class="right-menu quiet">{% trans "No builds" %}</span>
     {% endif %}
 
-    {% if project.has_good_build %}
-    <span class="dropdown" style="position:absolute; right:0px; top:0px;">
-      <span>
-          <a href="{{ project.get_docs_url }}">{% trans "View Docs" %}</a>
-        <a href="#">&#x25BC;</a>
-      </span>
-      <ul>
-          <li><input type="search" placeholder="{% trans "Search" %}&hellip;" /></li>
-          {% for version in project.ordered_active_versions reversed %}
-              <li><a href="{{ version.get_absolute_url }}">{{ version.slug }}</a></li>
-          {% endfor %}
-      </ul>
-    </span>
-    {% else %}
     <ul class="module-item-menu">
-      <li><a href="{{ project.get_builds_url }}">{% trans "No Docs" %}</a></li>
+      <li>
+        {% if project.has_good_build %}
+          <a href="{{ project.get_docs_url }}">{% trans "View Docs" %}</a>
+        {% else %}
+          <a href="{{ project.get_builds_url }}">{% trans "No Docs" %}</a>
+        {% endif %}
+      </li>
     </ul>
-    {% endif %}
 
 
   </li>

Diff for: readthedocs/templates/core/project_list_featured.html

@@ -7,24 +7,15 @@
         <a href="{{ user.get_absolute_url }}" class="quiet">({{ user }})</a>
     {% endfor %}
 
-    {% if project.has_good_build %}
-    <span class="dropdown" style="position:absolute; right:0px; top:0px;">
-      <span>
-          <a href="{{ project.get_docs_url }}">{% trans "View Docs" %}</a>
-        <a href="#">&#x25BC;</a>
-      </span>
-      <ul>
-          <li><input type="search" placeholder="{% trans "Search" %}&hellip;" /></li>
-          {% for version in project.ordered_active_versions reversed %}
-              <li><a href="{{ version.get_absolute_url }}">{{ version.slug }}</a></li>
-          {% endfor %}
-      </ul>
-    </span>
-    {% else %}
     <ul class="module-item-menu">
-      <li><a href="{{ project.get_builds_url }}">{% trans "No Docs" %}</a></li>
+      <li>
+        {% if project.has_good_build %}
+          <a href="{{ project.get_docs_url }}">{% trans "View Docs" %}</a>
+        {% else %}
+          <a href="{{ project.get_builds_url }}">{% trans "No Docs" %}</a>
+        {% endif %}
+      </li>
     </ul>
-    {% endif %}
 
   </li>