Port more 3.2.x code #5126
Merged
Port more 3.2.x code #5126
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
Fix toolbar order
Bump hvad version in tests
…to save the default behaviour
| @@ -30,7 +30,7 @@ | |||
| # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. | |||
| #extensions = ['sphinx.ext.autodoc'] | |||
|
|
|||
| extensions = ['djangocms', 'sphinx.ext.intersphinx', 'sphinx.ext.todo'] | |||
| extensions = ['djangocms', 'sphinx.ext.intersphinx'] | |||
There was a problem hiding this comment.
please don't do this, sphinx.ext.todo is actually useful
this is the correct fix for the sphinx issue 7979a06 and it's already in develop
There was a problem hiding this comment.
I'm backporting the fix in 3.2
I think that such test-related fixes should be first applied to earlier versions and then forwardported, or at least they should be advertised as needing for backporting, otherwise they get lost
yakky
force-pushed
the
merge/3.2.3.post1b
branch
from
e760d7b
to
fc90286
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.