From 241d46847b28471035e11080a9e465614c8a3e84 Mon Sep 17 00:00:00 2001 From: Yasumichi Akahoshi Date: Thu, 29 Jan 2026 09:51:46 +0900 Subject: [PATCH] Migrated from helpers.markdown() to helpers.renderMarkup(). (#3939) --- .../gitbucket/core/issues/milestones/list.scala.html | 11 +++++++---- .../core/issues/milestones/milestone.scala.html | 11 +++++++---- .../twirl/gitbucket/core/pulls/mergeguide.scala.html | 11 +++++++---- .../twirl/gitbucket/core/releases/list.scala.html | 8 +++++--- .../twirl/gitbucket/core/releases/release.scala.html | 8 +++++--- 5 files changed, 31 insertions(+), 18 deletions(-) diff --git a/src/main/twirl/gitbucket/core/issues/milestones/list.scala.html b/src/main/twirl/gitbucket/core/issues/milestones/list.scala.html index b5c3a16ef..243c72b0c 100644 --- a/src/main/twirl/gitbucket/core/issues/milestones/list.scala.html +++ b/src/main/twirl/gitbucket/core/issues/milestones/list.scala.html @@ -78,13 +78,16 @@ @milestone.description.map { description =>
- @helpers.markdown( - markdown = description, - repository = repository, + @helpers.renderMarkup( + filePath = List("temporary.md"), + fileContent = description, branch = repository.repository.defaultBranch, + repository = repository, enableWikiLink = false, enableRefsLink = false, - enableLineBreaks = true + enableAnchor = false, + enableLineBreaks = true, + enableTaskList = false )
} diff --git a/src/main/twirl/gitbucket/core/issues/milestones/milestone.scala.html b/src/main/twirl/gitbucket/core/issues/milestones/milestone.scala.html index 941362153..c4d00a259 100644 --- a/src/main/twirl/gitbucket/core/issues/milestones/milestone.scala.html +++ b/src/main/twirl/gitbucket/core/issues/milestones/milestone.scala.html @@ -64,13 +64,16 @@ @milestone.description.map { description =>
- @helpers.markdown( - markdown = description, - repository = repository, + @helpers.renderMarkup( + filePath = List("temporary.md"), + fileContent = description, branch = repository.repository.defaultBranch, + repository = repository, enableWikiLink = false, enableRefsLink = false, - enableLineBreaks = true + enableAnchor = false, + enableLineBreaks = true, + enableTaskList = false )
} diff --git a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html index 5c889d67b..cf162e87b 100644 --- a/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html @@ -43,13 +43,16 @@

- @status.conflictMessage.map { message => @helpers.markdown( - markdown = message, - repository = originRepository, + @status.conflictMessage.map { message => @helpers.renderMarkup( + filePath = List("temporary.md"), + fileContent = message, branch = originRepository.repository.defaultBranch, + repository = originRepository, enableWikiLink = false, enableRefsLink = true, - enableLineBreaks = false + enableAnchor = false, + enableLineBreaks = false, + enableTaskList = false ) }
} else { diff --git a/src/main/twirl/gitbucket/core/releases/list.scala.html b/src/main/twirl/gitbucket/core/releases/list.scala.html index 602e2922d..5fdc66725 100644 --- a/src/main/twirl/gitbucket/core/releases/list.scala.html +++ b/src/main/twirl/gitbucket/core/releases/list.scala.html @@ -26,12 +26,14 @@

@helpers.avatarLink(release.author, 20) @helpers.user(release.author, styleClass="username") released this @gitbucket.core.helper.html.datetimeago(release.registeredDate)

- @helpers.markdown( - markdown = release.content getOrElse "No description provided.", - repository = repository, + @helpers.renderMarkup( + filePath = List("temporary.md"), + fileContent = release.content getOrElse "No description provided.", branch = repository.repository.defaultBranch, + repository = repository, enableWikiLink = false, enableRefsLink = true, + enableAnchor = false, enableLineBreaks = true, enableTaskList = true, hasWritePermission = hasWritePermission diff --git a/src/main/twirl/gitbucket/core/releases/release.scala.html b/src/main/twirl/gitbucket/core/releases/release.scala.html index e51a5280f..454555e8a 100644 --- a/src/main/twirl/gitbucket/core/releases/release.scala.html +++ b/src/main/twirl/gitbucket/core/releases/release.scala.html @@ -31,12 +31,14 @@

@helpers.avatarLink(release.author, 20) @helpers.user(release.author, styleClass="username") released this @gitbucket.core.helper.html.datetimeago(release.registeredDate)

- @helpers.markdown( - markdown = release.content getOrElse "No description provided.", - repository = repository, + @helpers.renderMarkup( + filePath = List("temporary.md"), + fileContent = release.content getOrElse "No description provided.", branch = repository.repository.defaultBranch, + repository = repository, enableWikiLink = false, enableRefsLink = true, + enableAnchor = false, enableLineBreaks = true, enableTaskList = true, hasWritePermission = hasWritePermission