mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-08 14:35:52 +01:00
(refs #2)Add header which shows pull request information to the pull request detail page.
This commit is contained in:
@@ -14,7 +14,7 @@
|
|||||||
@import org.eclipse.jgit.diff.DiffEntry.ChangeType
|
@import org.eclipse.jgit.diff.DiffEntry.ChangeType
|
||||||
@html.main("Pull Requests - " + repository.owner + "/" + repository.name){
|
@html.main("Pull Requests - " + repository.owner + "/" + repository.name){
|
||||||
@html.header("pulls", repository)
|
@html.header("pulls", repository)
|
||||||
<div style="border: 1px solid #eee; background-color: #f8f8f8; margin-bottom: 10px; padding: 8px;">
|
<div class="pullreq-info">
|
||||||
<div id="compare-info">
|
<div id="compare-info">
|
||||||
<a href="#" id="edit-compare-condition" class="btn btn-mini pull-right">Edit</a>
|
<a href="#" id="edit-compare-condition" class="btn btn-mini pull-right">Edit</a>
|
||||||
<span class="label label-info monospace">@originRepository.owner:@originId</span> ... <span class="label label-info monospace">@forkedRepository.owner:@forkedId</span>
|
<span class="label label-info monospace">@originRepository.owner:@originId</span> ... <span class="label label-info monospace">@forkedRepository.owner:@forkedId</span>
|
||||||
|
|||||||
@@ -14,6 +14,24 @@
|
|||||||
@import view.helpers._
|
@import view.helpers._
|
||||||
@html.main("%s - Pull Request #%d - %s/%s".format(issue.title, issue.issueId, repository.owner, repository.name)){
|
@html.main("%s - Pull Request #%d - %s/%s".format(issue.title, issue.issueId, repository.owner, repository.name)){
|
||||||
@html.header("pulls", repository)
|
@html.header("pulls", repository)
|
||||||
|
<div class="pullreq-info">
|
||||||
|
@if(issue.closed) {
|
||||||
|
@comments.find(_.action == "merge").map{ comment =>
|
||||||
|
<span class="label label-info">Merged</span>
|
||||||
|
<a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> merged @commits.flatten.size @plural(commits.flatten.size, "commit")
|
||||||
|
into <code>@pullreq.requestUserName:@pullreq.requestBranch</code> from <code>@pullreq.userName:@pullreq.branch</code>
|
||||||
|
at @datetime(comment.registeredDate)
|
||||||
|
}.getOrElse {
|
||||||
|
<span class="label label-important">Closed</span>
|
||||||
|
<a href="@url(issue.openedUserName)" class="username strong">@issue.openedUserName</a> wants to merge @commits.flatten.size @plural(commits.flatten.size, "commit")
|
||||||
|
into <code>@pullreq.requestUserName:@pullreq.requestBranch</code> from <code>@pullreq.userName:@pullreq.branch</code>
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
<span class="label label-success">Open</span>
|
||||||
|
<a href="@url(issue.openedUserName)" class="username strong">@issue.openedUserName</a> wants to merge @commits.flatten.size @plural(commits.flatten.size, "commit")
|
||||||
|
into <code>@pullreq.requestUserName:@pullreq.requestBranch</code> from <code>@pullreq.userName:@pullreq.branch</code>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
<ul class="nav nav-tabs" id="pullreq-tab">
|
<ul class="nav nav-tabs" id="pullreq-tab">
|
||||||
<li class="active"><a href="#discussion">Discussion</a></li>
|
<li class="active"><a href="#discussion">Discussion</a></li>
|
||||||
<li><a href="#commits">Commits <span class="badge">@commits.flatten.size</span></a></li>
|
<li><a href="#commits">Commits <span class="badge">@commits.flatten.size</span></a></li>
|
||||||
|
|||||||
@@ -616,6 +616,16 @@ div.issue-comment-action {
|
|||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/****************************************************************************/
|
||||||
|
/* Pull Request */
|
||||||
|
/****************************************************************************/
|
||||||
|
div.pullreq-info {
|
||||||
|
border: 1px solid #ddd;
|
||||||
|
background-color: #f8f8f8;
|
||||||
|
margin-bottom: 10px;
|
||||||
|
padding: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
/****************************************************************************/
|
/****************************************************************************/
|
||||||
/* Wiki */
|
/* Wiki */
|
||||||
/****************************************************************************/
|
/****************************************************************************/
|
||||||
|
|||||||
Reference in New Issue
Block a user