Skip to content

Force to use proxied API for footer and search #6768

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

Merged
merged 4 commits into from
Apr 20, 2020
Merged

Conversation

stsewd
Copy link
Member

@stsewd stsewd commented Mar 10, 2020

This reverts:

And force the use of the proxied api to all docs.
This wasn't done before because .com wasn't ready.

Note for users using a custom installation and not using subdomains, you'll need to edit these files to point to your main domain.

This reverts:
- #6355
- #6131

And force the use of the proxied api to all docs.
This wasn't done before because .com wasn't ready.
@stsewd stsewd requested a review from a team March 10, 2020 20:25
@@ -18,7 +18,6 @@ class DockerBaseSettings(CommunityDevSettings):
PRODUCTION_DOMAIN = 'community.dev.readthedocs.io'
PUBLIC_DOMAIN = 'community.dev.readthedocs.io'
PUBLIC_API_URL = f'http://{PRODUCTION_DOMAIN}'
RTD_PROXIED_API_URL = PUBLIC_API_URL
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we keep the setting, to make it easier for users to override? I think supporting the setting is fine, I just want a default that is _/ as we have now.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We had that setting to pass it down to context during build time. But we want to apply this change to everyone. So, not sure if we can have both.

@stsewd stsewd requested a review from ericholscher March 17, 2020 16:56
stsewd added a commit to readthedocs/readthedocs-sphinx-ext that referenced this pull request Mar 17, 2020
Copy link
Member

@ericholscher ericholscher left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should get this shipped and make sure to QA it on release. I'll add it to the card. 👍

@stsewd
Copy link
Member Author

stsewd commented Apr 20, 2020

This needs to regenerate the static js files, I wasn't able to do it with my node setup for now... I'll try later.

@stsewd
Copy link
Member Author

stsewd commented Apr 20, 2020

This needs to regenerate the static js files

I was able to run npm now, turns out js files are already up to date, tested it locally to confirm too.

@stsewd stsewd merged commit cf3b742 into master Apr 20, 2020
@stsewd stsewd deleted the force-use-proxied-api branch April 20, 2020 17:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants