diff --git a/src/main/scala/gitbucket/core/controller/ReleasesController.scala b/src/main/scala/gitbucket/core/controller/ReleasesController.scala index ee8c785..32afbda 100644 --- a/src/main/scala/gitbucket/core/controller/ReleasesController.scala +++ b/src/main/scala/gitbucket/core/controller/ReleasesController.scala @@ -121,7 +121,7 @@ createReleaseAsset(repository.owner, repository.name, tagName, fileId, fileName, size, loginAccount) } - recordReleaseActivity(repository.owner, repository.name, loginAccount.userName, form.name) + recordReleaseActivity(repository.owner, repository.name, loginAccount.userName, form.name, tagName) redirect(s"/${repository.owner}/${repository.name}/releases/${tagName}") }) diff --git a/src/main/scala/gitbucket/core/service/ActivityService.scala b/src/main/scala/gitbucket/core/service/ActivityService.scala index f48126d..cba9007 100644 --- a/src/main/scala/gitbucket/core/service/ActivityService.scala +++ b/src/main/scala/gitbucket/core/service/ActivityService.scala @@ -352,15 +352,19 @@ currentDate ) - def recordReleaseActivity(userName: String, repositoryName: String, activityUserName: String, name: String)( - implicit s: Session - ): Unit = + def recordReleaseActivity( + userName: String, + repositoryName: String, + activityUserName: String, + releaseName: String, + tagName: String + )(implicit s: Session): Unit = Activities insert Activity( userName, repositoryName, activityUserName, "release", - s"[user:${activityUserName}] released [release:${userName}/${repositoryName}/${name}] at [repo:${userName}/${repositoryName}]", + s"[user:${activityUserName}] released [release:${userName}/${repositoryName}/${tagName}:${releaseName}] 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 5fa80ed..067e330 100644 --- a/src/main/scala/gitbucket/core/view/helpers.scala +++ b/src/main/scala/gitbucket/core/view/helpers.scala @@ -235,10 +235,10 @@ .group(2)}@${m.group(3).substring(0, 7)}""" ) .replaceAll( - "\\[release:([^\\s]+?)/([^\\s]+?)/([^\\s]+?)\\]", + "\\[release:([^\\s]+?)/([^\\s]+?)/([^\\s]+?):(.+)\\]", (m: Match) => s"""${m - .group(3)}""" + .group(4)}""" ) )