Fix handling of local paths in html_logo/html_favicon directorives in conf.py #9440
+57
−2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tk0miya
requested changes
Jul 13, 2021
Sure! Well, hmm, it seems that it's already on 4.1.x: $ git rev-parse origin/4.1.x
3c3a734b97c99a9f2b32bd33f7b98921d9da294f
$ git rebase origin/4.1.x
Current branch logo-regression-fix is up to date.I think I may have accidentally just set the target branch incorrectly on this merge request %-) |
|
This PR contains the CHANGES entry for 4.2.0. I guess you created a commit on the 4.x branch. Thanks, |
… conf.py Merge request sphinx-doc#9381 broke support for local logos/favicons as it retained the paths that are passed to the template engine. That's wrong as the actual path will be in _static/. This should fix sphinx-doc#9438
tronical
force-pushed
the
logo-regression-fix
branch
from
efb7757
to
3a50abc
Compare
|
Ooops, indeed, that explains it. Ok, rebased and force-pushed. I hope it's correct now :) |
tk0miya
approved these changes
Jul 13, 2021
|
Thank you for quick update! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge request #9381 broke support for local logos/favicons as it
retained the paths that are passed to the template engine. That's wrong
as the actual path will be in _static/.
This should fix #9438