diff --git a/src/main/twirl/gitbucket/core/pulls/menu.scala.html b/src/main/twirl/gitbucket/core/pulls/menu.scala.html index 5fc8c5e..d5bb98b 100644 --- a/src/main/twirl/gitbucket/core/pulls/menu.scala.html +++ b/src/main/twirl/gitbucket/core/pulls/menu.scala.html @@ -44,8 +44,8 @@ @helpers.user(comment.commentedUserName, styleClass = "username strong") merged @commits.size @helpers.plural(commits.size, "commit") - into @pullreq.userName:@pullreq.branch from @pullreq.requestUserName - :@pullreq.requestBranch + into @pullreq.userName:@pullreq.branch + from @pullreq.requestUserName:@pullreq.requestBranch @gitbucket.core.helper.html.datetimeago(comment.registeredDate) }.getOrElse { @@ -53,8 +53,8 @@ @helpers.user(issue.openedUserName, styleClass = "username strong") wants to merge @commits.size @helpers.plural(commits.size, "commit") - into @pullreq.userName:@pullreq.branch from @pullreq.requestUserName - :@pullreq.requestBranch + into @pullreq.userName:@pullreq.branch + from @pullreq.requestUserName:@pullreq.requestBranch } } else { @@ -62,8 +62,8 @@ @helpers.user(issue.openedUserName, styleClass = "username strong") wants to merge @commits.size @helpers.plural(commits.size, "commit") - into @pullreq.userName:@pullreq.branch from @pullreq.requestUserName - :@pullreq.requestBranch + into @pullreq.userName:@pullreq.branch + from @pullreq.requestUserName:@pullreq.requestBranch }