From 324943b3cf0334e2ab2274587318d7b9406918b3 Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Mon, 14 Oct 2019 04:01:00 +0300 Subject: [PATCH 1/4] Update app.ini.sample Give further information on hyperlink rendering in Markdown --- custom/conf/app.ini.sample | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/custom/conf/app.ini.sample b/custom/conf/app.ini.sample index dd14089d2b06d..94a166e75547a 100644 --- a/custom/conf/app.ini.sample +++ b/custom/conf/app.ini.sample @@ -141,8 +141,9 @@ KEYWORDS = go,git,self-hosted,gitea [markdown] ; Enable hard line break extension ENABLE_HARD_LINE_BREAK = false -; List of custom URL-Schemes that are allowed as links when rendering Markdown -; for example git,magnet +; Comma separated list of custom URL-Schemes that are allowed as links when rendering Markdown +; for example http,https,git,magnet,ftp (more at https://en.wikipedia.org/wiki/List_of_URI_schemes) +: The default is http and https only. CUSTOM_URL_SCHEMES = ; List of file extensions that should be rendered/edited as Markdown ; Separate the extensions with a comma. To render files without any extension as markdown, just put a comma @@ -816,4 +817,4 @@ QUEUE_TYPE = channel QUEUE_LENGTH = 1000 ; Task queue connction string, available only when `QUEUE_TYPE` is `redis`. ; If there is a password of redis, use `addrs=127.0.0.1:6379 password=123 db=0`. -QUEUE_CONN_STR = "addrs=127.0.0.1:6379 db=0" \ No newline at end of file +QUEUE_CONN_STR = "addrs=127.0.0.1:6379 db=0" From 10ee131caa1c331eaa70c792337bc8ad3771bd91 Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Mon, 14 Oct 2019 09:57:39 +0300 Subject: [PATCH 2/4] Update app.ini.sample Follow feedback from @guillep2k for CUSTOM_URL in markdown to indicate http and https are always rendered as links. --- custom/conf/app.ini.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom/conf/app.ini.sample b/custom/conf/app.ini.sample index 94a166e75547a..5f32f2a6c2749 100644 --- a/custom/conf/app.ini.sample +++ b/custom/conf/app.ini.sample @@ -143,7 +143,7 @@ KEYWORDS = go,git,self-hosted,gitea ENABLE_HARD_LINE_BREAK = false ; Comma separated list of custom URL-Schemes that are allowed as links when rendering Markdown ; for example http,https,git,magnet,ftp (more at https://en.wikipedia.org/wiki/List_of_URI_schemes) -: The default is http and https only. +; URLs beginning in http and https are always displayed, whatever is put in this entry. CUSTOM_URL_SCHEMES = ; List of file extensions that should be rendered/edited as Markdown ; Separate the extensions with a comma. To render files without any extension as markdown, just put a comma From 8c8308c903d368ac63e5c66225e3fbc7f2455fa7 Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Mon, 14 Oct 2019 17:46:37 +0300 Subject: [PATCH 3/4] Update custom/conf/app.ini.sample Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com> --- custom/conf/app.ini.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom/conf/app.ini.sample b/custom/conf/app.ini.sample index 5f32f2a6c2749..e1dddfa81cc41 100644 --- a/custom/conf/app.ini.sample +++ b/custom/conf/app.ini.sample @@ -142,7 +142,7 @@ KEYWORDS = go,git,self-hosted,gitea ; Enable hard line break extension ENABLE_HARD_LINE_BREAK = false ; Comma separated list of custom URL-Schemes that are allowed as links when rendering Markdown -; for example http,https,git,magnet,ftp (more at https://en.wikipedia.org/wiki/List_of_URI_schemes) +; for example git,magnet,ftp (more at https://en.wikipedia.org/wiki/List_of_URI_schemes) ; URLs beginning in http and https are always displayed, whatever is put in this entry. CUSTOM_URL_SCHEMES = ; List of file extensions that should be rendered/edited as Markdown From 2ee909a5125a1dd3146baa5df6a878cbd3f412b8 Mon Sep 17 00:00:00 2001 From: Benson Muite Date: Mon, 14 Oct 2019 18:47:08 +0300 Subject: [PATCH 4/4] Update custom/conf/app.ini.sample Co-Authored-By: Antoine GIRARD --- custom/conf/app.ini.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom/conf/app.ini.sample b/custom/conf/app.ini.sample index e1dddfa81cc41..0eed6fc31f85f 100644 --- a/custom/conf/app.ini.sample +++ b/custom/conf/app.ini.sample @@ -143,7 +143,7 @@ KEYWORDS = go,git,self-hosted,gitea ENABLE_HARD_LINE_BREAK = 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 beginning in http and https are always displayed, whatever is put in this entry. +; URLs starting with http and https are always displayed, whatever is put in this entry. CUSTOM_URL_SCHEMES = ; List of file extensions that should be rendered/edited as Markdown ; Separate the extensions with a comma. To render files without any extension as markdown, just put a comma