diff --git a/src/main/scala/gitbucket/core/view/helpers.scala b/src/main/scala/gitbucket/core/view/helpers.scala index a0320ce91..221b750bc 100644 --- a/src/main/scala/gitbucket/core/view/helpers.scala +++ b/src/main/scala/gitbucket/core/view/helpers.scala @@ -155,6 +155,11 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache .replaceAll("\\[commit:([^\\s]+?)/([^\\s]+?)\\@([^\\s]+?)\\]", (m: Match) => s"""${m.group(1)}/${m.group(2)}@${m.group(3).substring(0, 7)}""") ) + /** + * Remove html tags from the given Html instance. + */ + def removeHtml(html: Html): Html = Html(html.body.replaceAll("<.+?>", "")) + /** * URL encode except '/'. */ diff --git a/src/main/twirl/gitbucket/core/helper/feed.scala.xml b/src/main/twirl/gitbucket/core/helper/feed.scala.xml index 440e1ff54..eab5badb5 100644 --- a/src/main/twirl/gitbucket/core/helper/feed.scala.xml +++ b/src/main/twirl/gitbucket/core/helper/feed.scala.xml @@ -16,7 +16,7 @@ @datetimeRFC3339(activity.activityDate) @datetimeRFC3339(activity.activityDate) - @activityMessage(activity.message) + @removeHtml(activityMessage(activity.message)) @activity.activityUserName @url(activity.activityUserName)