summaryrefslogtreecommitdiffstats
path: root/custom/conf
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2020-05-24 09:14:26 +0100
committerGitHub <noreply@github.com>2020-05-24 09:14:26 +0100
commit814ca9ffea229f55f1f69b34d9a7f84054115669 (patch)
tree1d6fcfaaa7035a42d6d489c1c57987a645e20615 /custom/conf
parent3761bdb640f1aeb9c68b3b491640eb9b0f9f9b0e (diff)
downloadgitea-814ca9ffea229f55f1f69b34d9a7f84054115669.tar.gz
gitea-814ca9ffea229f55f1f69b34d9a7f84054115669.zip
Allow different HardBreaks settings for documents and comments (#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>
Diffstat (limited to 'custom/conf')
-rw-r--r--custom/conf/app.ini.sample5
1 files changed, 4 insertions, 1 deletions
diff --git a/custom/conf/app.ini.sample b/custom/conf/app.ini.sample
index c8797ca56a..c50dd68f1f 100644
--- a/custom/conf/app.ini.sample
+++ b/custom/conf/app.ini.sample
@@ -216,7 +216,10 @@ EVENT_SOURCE_UPDATE_TIME = 10s
; Render soft line breaks as hard line breaks, which means a single newline character between
; paragraphs will cause a line break and adding trailing whitespace to paragraphs is not
; necessary to force a line break.
-ENABLE_HARD_LINE_BREAK = true
+; Render soft line breaks as hard line breaks for comments
+ENABLE_HARD_LINE_BREAK_IN_COMMENTS = true
+; Render soft line breaks as hard line breaks for markdown documents
+ENABLE_HARD_LINE_BREAK_IN_DOCUMENTS = false
; Comma separated list of custom URL-Schemes that are allowed as links when rendering Markdown
; for example git,magnet,ftp (more at https://en.wikipedia.org/wiki/List_of_URI_schemes)
; URLs starting with http and https are always displayed, whatever is put in this entry.