Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-10 15:35:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Format

Browse Source
This commit is contained in:
Naoki Takezoe
2016-05-28 22:18:57 +09:00
parent 23a5f7dcf9
commit 038b70ff0b
1 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
View File

@@ -19,16 +19,16 @@
<span class="text-@{summaryState.name}">— @summary checks</span> <span class="text-@{summaryState.name}">— @summary checks</span>
} }
</div> </div>
<div class="build-statuses-list" style="@if(status.isAllSuccess){ display:none; }else{ }"> <div class="build-statuses-list" style="@if(status.isAllSuccess){ display:none; }">
@status.statusesAndRequired.map{ case (status, required) => @status.statusesAndRequired.map { case (status, required) =>
<div class="build-status-item"> <div class="build-status-item">
<div class="pull-right"> <div class="pull-right">
@if(required){ <span class="label">Required</span> } @if(required){ <span class="label">Required</span> }
@status.targetUrl.map{ url => <a href="@url">Details</a> } @status.targetUrl.map { url => <a href="@url">Details</a> }
</div> </div>
<span class="build-status-icon text-@{status.state.name}">@commitStateIcon(status.state)</span> <span class="build-status-icon text-@{status.state.name}">@commitStateIcon(status.state)</span>
<strong>@status.context</strong> <strong>@status.context</strong>
@status.description.map{ desc => <span class="muted">— @desc</span> } @status.description.map { desc => <span class="muted">— @desc</span> }
</div> </div>
} }
</div> </div>
@@ -44,7 +44,8 @@
Only those with write access to this repository can merge pull requests. Only those with write access to this repository can merge pull requests.
} }
</div> </div>
} else { @if(status.branchIsOutOfDate){ } else {
@if(status.branchIsOutOfDate){
@if(status.hasUpdatePermission){ @if(status.hasUpdatePermission){
<div class="pull-right"> <div class="pull-right">
<form method="POST" action="@url(originRepository)/pull/@pullreq.issueId/update_branch"> <form method="POST" action="@url(originRepository)/pull/@pullreq.issueId/update_branch">
@@ -58,7 +59,8 @@
<div class="small"> <div class="small">
Merge the latest changes from <code>@pullreq.branch</code> into this branch. Merge the latest changes from <code>@pullreq.branch</code> into this branch.
</div> </div>
} else { @if(status.hasRequiredStatusProblem) { } else {
@if(status.hasRequiredStatusProblem) {
<div class="merge-indicator merge-indicator-warning"><span class="octicon octicon-primitive-dot"></span></div> <div class="merge-indicator merge-indicator-warning"><span class="octicon octicon-primitive-dot"></span></div>
<span class="strong">Required statuses must pass before merging.</span> <span class="strong">Required statuses must pass before merging.</span>
<div class="small"> <div class="small">
@@ -77,7 +79,9 @@
Only those with write access to this repository can merge pull requests. Only those with write access to this repository can merge pull requests.
</div> </div>
} }
} } } }
}
}
</div> </div>
@if(status.hasMergePermission){ @if(status.hasMergePermission){
<div style="padding:15px;border-top:solid 1px #e5e5e5;background:#fafafa"> <div style="padding:15px;border-top:solid 1px #e5e5e5;background:#fafafa">