Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Point users to support email instead asking to open an issue #6650

Merged
merged 7 commits into from Mar 5, 2020
Merged

Point users to support email instead asking to open an issue #6650

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ed0e4a0
Point users to support email instead asking to open an issue
humitos Feb 12, 2020
4709ea6
Remove SupportView because it's not needed
humitos Mar 4, 2020
fb0bb54
Define SUPPORT_EMAIL setting and use it where its needed
humitos Mar 4, 2020
0247f3e
Merge branch 'master' of github.com:readthedocs/readthedocs.org into …
humitos Mar 4, 2020
c1da535
Use context process for setting
humitos Mar 4, 2020
ce80ed6
Use support@example.org to avoid local installation email us
humitos Mar 5, 2020
c36898b
Use SUPPORT_EMAIL=None as default
humitos Mar 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions readthedocs/core/context_processors.py
View file
Open in desktop
Expand Up @@ -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
15 changes: 0 additions & 15 deletions readthedocs/core/views/__init__.py
View file
Open in desktop
Expand Up @@ -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(),
Expand Down
2 changes: 1 addition & 1 deletion readthedocs/settings/base.py
View file
Open in desktop
Expand Up @@ -59,7 +59,7 @@ class CommunityBaseSettings(Settings):
# Email
DEFAULT_FROM_EMAIL = 'no-reply@readthedocs.org'
SERVER_EMAIL = DEFAULT_FROM_EMAIL
SUPPORT_EMAIL = None
SUPPORT_EMAIL = 'support@readthedocs.org'
humitos marked this conversation as resolved.
Show resolved Hide resolved

# Sessions
SESSION_COOKIE_DOMAIN = 'readthedocs.org'
Expand Down
2 changes: 1 addition & 1 deletion readthedocs/templates/core/project_bar_base.html
View file
Open in desktop
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions readthedocs/urls.py
View file
Open in desktop
Expand Up @@ -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,
Expand All @@ -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$',
Expand Down