Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
e19921ac
Commit
e19921ac
authored
Apr 20, 2021
by
Enrique Alcantara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support hard breaks in content editor
parent
49da2048
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
app/assets/javascripts/content_editor/services/create_editor.js
...sets/javascripts/content_editor/services/create_editor.js
+2
-0
spec/frontend/fixtures/api_markdown.yml
spec/frontend/fixtures/api_markdown.yml
+4
-0
No files found.
app/assets/javascripts/content_editor/services/create_editor.js
View file @
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
:
{
...
...
spec/frontend/fixtures/api_markdown.yml
View file @
e19921ac
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment