Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-05-07 20:07:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1982 from kounoike/pr-fix-pr-message

Browse Source 
don't separate user:branch in PR message
This commit is contained in:
Naoki Takezoe
2018-04-29 09:31:52 +09:00
committed by GitHub
parent eef01262bd 069d84e249
commit 81c2d988a3
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">
@helpers.user(comment.commentedUserName, styleClass = "username strong")
merged @commits.size @helpers.plural(commits.size, "commit")
into <code>@pullreq.userName:@pullreq.branch</code> from <code>@pullreq.requestUserName
:@pullreq.requestBranch</code>
into <code>@pullreq.userName:@pullreq.branch</code>
from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
@gitbucket.core.helper.html.datetimeago(comment.registeredDate)
</span>
}.getOrElse {
@@ -53,8 +53,8 @@
<span class="muted">
@helpers.user(issue.openedUserName, styleClass = "username strong")
wants to merge @commits.size @helpers.plural(commits.size, "commit")
into <code>@pullreq.userName:@pullreq.branch</code> from <code>@pullreq.requestUserName
:@pullreq.requestBranch</code>
into <code>@pullreq.userName:@pullreq.branch</code>
from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
</span>
}
} else {
@@ -62,8 +62,8 @@
<span class="muted">
@helpers.user(issue.openedUserName, styleClass = "username strong")
wants to merge @commits.size @helpers.plural(commits.size, "commit")
into <code>@pullreq.userName:@pullreq.branch</code> from <code>@pullreq.requestUserName
:@pullreq.requestBranch</code>
into <code>@pullreq.userName:@pullreq.branch</code>
from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
</span>
}
</div>