Allow different HardBreaks settings for documents and comments #11515
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
Signed-off-by: Andrew Thornton <art27@cantab.net>
silverwind
reviewed
May 19, 2020
GiteaBot
added
the
lgtm/need 2
Co-authored-by: silverwind <me@silverwind.io>
silverwind
reviewed
May 19, 2020
Signed-off-by: Andrew Thornton <art27@cantab.net>
|
Unit test panics:
I don't understand why on Earth copying text in a drone log is so 🤬 difficult. |
|
@guillep2k unit tests fixed |
guillep2k
reviewed
May 20, 2020
| @@ -152,9 +152,12 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`. | |||
|
|
|||
| ## Markdown (`markdown`) | |||
|
|
|||
| - `ENABLE_HARD_LINE_BREAK`: **true**: Render soft line breaks as hard line breaks, which | |||
| - `ENABLE_HARD_LINE_BREAK_IN_COMMENTS`: **true**: Render soft line breaks as hard line breaks in comments, which | |||
There was a problem hiding this comment.
Suggested change
| - `ENABLE_HARD_LINE_BREAK_IN_COMMENTS`: **true**: Render soft line breaks as hard line breaks in comments, which | |
| Note: before 1.13, a single setting (`ENABLE_HARD_LINE_BREAK`) was used to control the following two cases simultaneously. It was deprecated in favor of better granularity. | |
| - `ENABLE_HARD_LINE_BREAK_IN_COMMENTS`: **true**: Render soft line breaks as hard line breaks in comments, which |
There was a problem hiding this comment.
It's not even deprecated - it's just not used.
There was a problem hiding this comment.
As this was introduced in 1.12 we still have time to fix this to not be breaking
There was a problem hiding this comment.
oh cool, let's remove that comment then!
There was a problem hiding this comment.
Default was changed at least, setting was there before but was false by default imho
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
zeripath
commented
May 20, 2020
guillep2k
approved these changes
May 21, 2020
GiteaBot
added
lgtm/need 1
6543
approved these changes
May 23, 2020
GiteaBot
added
lgtm/done
|
make lg-tm work |
|
@lafriks do I need to add warning to the documentation about the changes? |
|
As we will backport it I don't think it's needed as this will set back previous behavior that we made as breaking change in 1.12.0-rc1 |
|
make lg-tm work |
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
May 24, 2020
…tea#11515) GH has different HardBreaks behaviour for markdown comments and documents. Comments have hard breaks and documents have soft breaks - therefore Gitea's rendering will always be different from GH's if we only provide one setting. Here we split the setting in to two - one for documents and one for comments and other things. Signed-off-by: Andrew Thornton art27@cantab.net Changes to index.js as per @silverwind Co-authored-by: silverwind <me@silverwind.io> Changes to docs as per @guillep2k Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
zeripath
added a commit
that referenced
this pull request
May 24, 2020
… (#11599) GH has different HardBreaks behaviour for markdown comments and documents. Comments have hard breaks and documents have soft breaks - therefore Gitea's rendering will always be different from GH's if we only provide one setting. Here we split the setting in to two - one for documents and one for comments and other things. Signed-off-by: Andrew Thornton art27@cantab.net Changes to index.js as per @silverwind Co-authored-by: silverwind <me@silverwind.io> Changes to docs as per @guillep2k Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
ydelafollye
pushed a commit
to ydelafollye/gitea
that referenced
this pull request
Jul 31, 2020
…tea#11515) GH has different HardBreaks behaviour for markdown comments and documents. Comments have hard breaks and documents have soft breaks - therefore Gitea's rendering will always be different from GH's if we only provide one setting. Here we split the setting in to two - one for documents and one for comments and other things. Signed-off-by: Andrew Thornton art27@cantab.net Changes to index.js as per @silverwind Co-authored-by: silverwind <me@silverwind.io> Changes to docs as per @guillep2k Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
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.
GH has different HardBreaks behaviour for markdown comments and documents.
Comments have hard breaks and documents have soft breaks - therefore Gitea's rendering will always be different from GH's if we only provide one setting.
Here we split the setting in to two - one for documents and one for comments and other things.
Signed-off-by: Andrew Thornton art27@cantab.net