Commit 95638a05 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch 'add-hard-break-support-content-editor' into 'master'

Support hard line breaks in Content Editor

See merge request gitlab-org/gitlab!59827
parents 6944d387 e19921ac
......@@ -12,6 +12,7 @@ import {
BulletList,
OrderedList,
ListItem,
HardBreak,
} from 'tiptap-extensions';
import { PROVIDE_SERIALIZER_OR_RENDERER_ERROR } from '../constants';
import CodeBlockHighlight from '../extensions/code_block_highlight';
......@@ -36,6 +37,7 @@ const createEditor = async ({ content, renderMarkdown, serializer: customSeriali
new ListItem(),
new OrderedList(),
new CodeBlockHighlight(),
new HardBreak(),
],
editorProps: {
attributes: {
......
......@@ -48,3 +48,7 @@
3. list item 3
- name: image
markdown: '![alt text](https://gitlab.com/logo.png)'
- name: hard_break
markdown: |-
This is a line after a\
hard break
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment