mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-10 15:35:59 +01:00
Format
This commit is contained in:
@@ -19,16 +19,16 @@
|
||||
<span class="text-@{summaryState.name}">— @summary checks</span>
|
||||
}
|
||||
</div>
|
||||
<div class="build-statuses-list" style="@if(status.isAllSuccess){ display:none; }else{ }">
|
||||
@status.statusesAndRequired.map{ case (status, required) =>
|
||||
<div class="build-statuses-list" style="@if(status.isAllSuccess){ display:none; }">
|
||||
@status.statusesAndRequired.map { case (status, required) =>
|
||||
<div class="build-status-item">
|
||||
<div class="pull-right">
|
||||
@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>
|
||||
<span class="build-status-icon text-@{status.state.name}">@commitStateIcon(status.state)</span>
|
||||
<strong>@status.context</strong>
|
||||
@status.description.map{ desc => <span class="muted">— @desc</span> }
|
||||
@status.description.map { desc => <span class="muted">— @desc</span> }
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
@@ -44,7 +44,8 @@
|
||||
Only those with write access to this repository can merge pull requests.
|
||||
}
|
||||
</div>
|
||||
} else { @if(status.branchIsOutOfDate){
|
||||
} else {
|
||||
@if(status.branchIsOutOfDate){
|
||||
@if(status.hasUpdatePermission){
|
||||
<div class="pull-right">
|
||||
<form method="POST" action="@url(originRepository)/pull/@pullreq.issueId/update_branch">
|
||||
@@ -58,7 +59,8 @@
|
||||
<div class="small">
|
||||
Merge the latest changes from <code>@pullreq.branch</code> into this branch.
|
||||
</div>
|
||||
} else { @if(status.hasRequiredStatusProblem) {
|
||||
} else {
|
||||
@if(status.hasRequiredStatusProblem) {
|
||||
<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>
|
||||
<div class="small">
|
||||
@@ -77,7 +79,9 @@
|
||||
Only those with write access to this repository can merge pull requests.
|
||||
</div>
|
||||
}
|
||||
} } }
|
||||
}
|
||||
}
|
||||
}
|
||||
</div>
|
||||
@if(status.hasMergePermission){
|
||||
<div style="padding:15px;border-top:solid 1px #e5e5e5;background:#fafafa">
|
||||
|
||||
Reference in New Issue
Block a user