Merge pull request #6650 from readthedocs/humitos/skip-contact-support

Point users to support email instead asking to open an issue

Author: humitos

readthedocs/core/context_processors.py

@@ -17,5 +17,6 @@ def readthedocs_processor(request):
         'TEMPLATE_ROOT': settings.TEMPLATE_ROOT + '/',
         'DO_NOT_TRACK_ENABLED': settings.DO_NOT_TRACK_ENABLED,
         'USE_PROMOS': settings.USE_PROMOS,
+        'SUPPORT_EMAIL': settings.SUPPORT_EMAIL,
     }
     return exports

readthedocs/core/views/__init__.py

@@ -45,21 +45,6 @@ def get_context_data(self, **kwargs):
         return context
 
 
-class SupportView(TemplateView):
-    template_name = 'support.html'
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        support_email = settings.SUPPORT_EMAIL
-        if not support_email:
-            support_email = 'support@{domain}'.format(
-                domain=settings.PRODUCTION_DOMAIN
-            )
-
-        context['support_email'] = support_email
-        return context
-
-
 def wipe_version(request, project_slug, version_slug):
     version = get_object_or_404(
         Version.internal.all(),

readthedocs/templates/core/project_bar_base.html

@@ -31,7 +31,7 @@ <h1>
           {% blocktrans trimmed %}
             Your project is currently disabled for abuse of the system.
             Please make sure it isn't using unreasonable amounts of resources or triggering lots of builds in a short amount of time.
-            Please <a href="https://github.com/rtfd/readthedocs.org/issues">file a ticket</a> to get your project re-enabled.
+            Please <a href="mailto:{{ SUPPORT_EMAIL }}">contact support</a> to get your project re-enabled.
           {% endblocktrans %}
       </p>
       <br>

readthedocs/urls.py

@@ -12,7 +12,6 @@
 from readthedocs.core.urls import core_urls, docs_urls
 from readthedocs.core.views import (
     HomepageView,
-    SupportView,
     do_not_track,
     server_error_404,
     server_error_500,
@@ -28,7 +27,7 @@
 
 basic_urls = [
     url(r'^$', HomepageView.as_view(), name='homepage'),
-    url(r'^support/', SupportView.as_view(), name='support'),
+    url(r'^support/', TemplateView.as_view(template_name='support.html'), name='support'),
     url(r'^security/', TemplateView.as_view(template_name='security.html')),
     url(
         r'^\.well-known/security.txt$',