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

Check 404 page once when slug and default_version is the same #6796

Merged
merged 1 commit into from Mar 20, 2020
Merged

Check 404 page once when slug and default_version is the same #6796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion common
Open in desktop
Submodule common updated 1 files
+9 −3 dockerfiles/scripts/create-containers.sh
2 changes: 1 addition & 1 deletion readthedocs/proxito/views/serve.py
View file
Open in desktop
Expand Up @@ -261,7 +261,7 @@ def get(self, request, proxito_path, template_name='404.html'):
# If that doesn't work, attempt to serve the 404 of the current version (version_slug)
# Secondly, try to serve the 404 page for the default version
# (project.get_default_version())
for version_slug_404 in [version_slug, final_project.get_default_version()]:
for version_slug_404 in set([version_slug, final_project.get_default_version()]):
for tryfile in ('404.html', '404/index.html'):
storage_root_path = final_project.get_storage_path(
type_='html',
Expand Down