Merge branch '25155-fix-edited-text-in-comments' into 'master'
break comment "edited at" block out of the note-text element to prevent issues w…
## What does this MR do?
Moves "edited" text below a note into its own element apart from rendered markdown to prevent issues when it is preceded by an inline text node.
## Are there points in the code the reviewer needs to double check?
to reproduce the bug, add text immediately following an image in a note's markdown like so:
```markdown
 test text here
```
then edit and save the note.
## Why was this MR needed?
## Screenshots (if relevant)
Before:
After:
## Does this MR meet the acceptance criteria?
- [ ] ~~[Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added~~
- [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~
- [ ] ~~API support added~~
- Tests
- [ ] ~~Added for this feature/bug~~
- [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #25155
See merge request !8048
Showing
Please
register
or
sign in
to comment