From 7ab1f3e886fd2b574e66194c85aa3a4eb2b75ba1 Mon Sep 17 00:00:00 2001 From: Ikebe Shodai Date: Fri, 2 Nov 2018 17:39:11 +0900 Subject: [PATCH] Allow to redirect to Release page from activity --- src/main/scala/gitbucket/core/service/ActivityService.scala | 2 +- src/main/scala/gitbucket/core/view/helpers.scala | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/scala/gitbucket/core/service/ActivityService.scala b/src/main/scala/gitbucket/core/service/ActivityService.scala index ef8318806..f48126dcf 100644 --- a/src/main/scala/gitbucket/core/service/ActivityService.scala +++ b/src/main/scala/gitbucket/core/service/ActivityService.scala @@ -360,7 +360,7 @@ trait ActivityService { repositoryName, activityUserName, "release", - s"[user:${activityUserName}] released ${name} at [repo:${userName}/${repositoryName}]", + s"[user:${activityUserName}] released [release:${userName}/${repositoryName}/${name}] at [repo:${userName}/${repositoryName}]", None, currentDate ) diff --git a/src/main/scala/gitbucket/core/view/helpers.scala b/src/main/scala/gitbucket/core/view/helpers.scala index e3a8d6a13..ab7d5bd0d 100644 --- a/src/main/scala/gitbucket/core/view/helpers.scala +++ b/src/main/scala/gitbucket/core/view/helpers.scala @@ -232,6 +232,12 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache s"""${m.group(1)}/${m .group(2)}@${m.group(3).substring(0, 7)}""" ) + .replaceAll( + "\\[release:([^\\s]+?)/([^\\s]+?)/([^\\s]+?)\\]", + (m: Match) => + s"""${m + .group(3)}""" + ) ) /**