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

[stable25] Fix hard line breaks displayed with additional new line between #3416

Merged
merged 5 commits into from
Nov 13, 2022

Conversation

juliushaertl
Copy link
Member

Backport of #3388

Signed-off-by: Ferdinand Thiessen <rpm@fthiessen.de>
To preserve softbreaks within md files we preserve all whitespaces,
so we must not introduce additional new lines after `<br>` elements.

Signed-off-by: Ferdinand Thiessen <rpm@fthiessen.de>
No additional new line should be added after hard line breaks,
this is tested by a new tiptap test.
Modified CommonMark rendering test to allow hard breaks without
newline.

Signed-off-by: Ferdinand Thiessen <rpm@fthiessen.de>
@juliushaertl juliushaertl requested review from susnux, a team, julien-nc and max-nextcloud and removed request for a team November 11, 2022 14:08
@juliushaertl juliushaertl added bug Something isn't working 3. to review labels Nov 11, 2022
@cypress
Copy link

cypress bot commented Nov 11, 2022



Test summary

97 0 0 0Flakiness 2


Run details

Project Text
Status Passed
Commit 41ed7bd ℹ️
Started Nov 13, 2022 3:23 PM
Ended Nov 13, 2022 3:29 PM
Duration 05:16 💡
OS Linux Ubuntu - 20.04
Browser Electron 106

View run in Cypress Dashboard ➡️


Flakiness

links.spec.js Flakiness
1 test link marks > link preview > shows a link preview
mentions.spec.js Flakiness
1 Test mentioning users > Type @ and see the user list

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. You can manage this integration in this project's settings in the Cypress Dashboard

@juliushaertl
Copy link
Member Author

/compile

mejo-
mejo- previously approved these changes Nov 11, 2022
@mejo- mejo- dismissed their stale review November 11, 2022 17:41

seems like something is missing.

@mejo- mejo- self-requested a review November 11, 2022 17:42
susnux and others added 2 commits November 13, 2022 16:21
Signed-off-by: Ferdinand Thiessen <rpm@fthiessen.de>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@susnux
Copy link
Contributor

susnux commented Nov 13, 2022

The commonmark normalization was missing from the backport

@mejo- mejo- merged commit ab1507e into stable25 Nov 13, 2022
@delete-merged-branch delete-merged-branch bot deleted the backport/3388/stable25 branch November 13, 2022 18:54
@blizzz blizzz mentioned this pull request Nov 21, 2022
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2. developing bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants