Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-05 04:56:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

don't separate user:branch in PR message

Browse Source
This commit is contained in:
KOUNOIKE Yuusuke
2018-04-28 21:35:15 +09:00
parent cf038ebd38
commit 069d84e249
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/twirl/gitbucket/core/pulls/menu.scala.html
View File

@@ -44,8 +44,8 @@
<span class="muted"> <span class="muted">
@helpers.user(comment.commentedUserName, styleClass = "username strong") @helpers.user(comment.commentedUserName, styleClass = "username strong")
merged @commits.size @helpers.plural(commits.size, "commit") merged @commits.size @helpers.plural(commits.size, "commit")
into <code>@pullreq.userName:@pullreq.branch</code> from <code>@pullreq.requestUserName into <code>@pullreq.userName:@pullreq.branch</code>
:@pullreq.requestBranch</code> from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
@gitbucket.core.helper.html.datetimeago(comment.registeredDate) @gitbucket.core.helper.html.datetimeago(comment.registeredDate)
</span> </span>
}.getOrElse { }.getOrElse {
@@ -53,8 +53,8 @@
<span class="muted"> <span class="muted">
@helpers.user(issue.openedUserName, styleClass = "username strong") @helpers.user(issue.openedUserName, styleClass = "username strong")
wants to merge @commits.size @helpers.plural(commits.size, "commit") wants to merge @commits.size @helpers.plural(commits.size, "commit")
into <code>@pullreq.userName:@pullreq.branch</code> from <code>@pullreq.requestUserName into <code>@pullreq.userName:@pullreq.branch</code>
:@pullreq.requestBranch</code> from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
</span> </span>
} }
} else { } else {
@@ -62,8 +62,8 @@
<span class="muted"> <span class="muted">
@helpers.user(issue.openedUserName, styleClass = "username strong") @helpers.user(issue.openedUserName, styleClass = "username strong")
wants to merge @commits.size @helpers.plural(commits.size, "commit") wants to merge @commits.size @helpers.plural(commits.size, "commit")
into <code>@pullreq.userName:@pullreq.branch</code> from <code>@pullreq.requestUserName into <code>@pullreq.userName:@pullreq.branch</code>
:@pullreq.requestBranch</code> from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
</span> </span>
} }
</div> </div>