diff --git a/src/main/scala/gitbucket/core/view/helpers.scala b/src/main/scala/gitbucket/core/view/helpers.scala index a0320ce..221b750 100644 --- a/src/main/scala/gitbucket/core/view/helpers.scala +++ b/src/main/scala/gitbucket/core/view/helpers.scala @@ -156,6 +156,11 @@ ) /** + * Remove html tags from the given Html instance. + */ + def removeHtml(html: Html): Html = Html(html.body.replaceAll("<.+?>", "")) + + /** * URL encode except '/'. */ def encodeRefName(value: String): String = StringUtil.urlEncode(value).replace("%2F", "/") diff --git a/src/main/twirl/gitbucket/core/helper/feed.scala.xml b/src/main/twirl/gitbucket/core/helper/feed.scala.xml index 865cee9..eab5bad 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) - @activity.activityType + @removeHtml(activityMessage(activity.message)) @activity.activityUserName @url(activity.activityUserName)