forked from Shiloh/githaven
e5d8e2d10c
Once a branch has been merged if the commit ID no longer equals that of the pulls ref commit id don't offer to delete the branch on the pull screen and don't list it as merged on branches. Fix #9201 When looking at the pull page we should also get the commits from the refs/pulls/x/head Fix #9158
143 lines
7.6 KiB
Cheetah
143 lines
7.6 KiB
Cheetah
{{template "base/head" .}}
|
|
<div class="ui repository branches">
|
|
{{template "repo/header" .}}
|
|
<div class="ui container">
|
|
{{template "base/alert" .}}
|
|
{{template "repo/sub_menu" .}}
|
|
<h4 class="ui top attached header">
|
|
{{.i18n.Tr "repo.default_branch"}}
|
|
</h4>
|
|
|
|
<div class="ui attached table segment">
|
|
<table class="ui very basic striped fixed table single line">
|
|
<tbody>
|
|
<tr>
|
|
<td>
|
|
{{range .Branches}}
|
|
{{if eq .Name $.DefaultBranch}}
|
|
{{if .IsProtected}}
|
|
<i class="octicon octicon-shield"></i>
|
|
{{end}}
|
|
<a href="{{$.RepoLink}}/src/branch/{{$.DefaultBranch | EscapePound}}">{{$.DefaultBranch}}</a>
|
|
<p class="info"><i class="octicon octicon-git-commit"></i><a href="{{$.RepoLink}}/commit/{{.Commit.ID.String}}">{{ShortSha .Commit.ID.String}}</a> · <span class="commit-message">{{RenderCommitMessage .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}}</span> · {{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}</p>
|
|
{{end}}
|
|
{{end}}
|
|
</td>
|
|
<td class="right aligned overflow-visible">
|
|
<div class="ui basic jump dropdown icon button poping up" data-content="{{$.i18n.Tr "repo.branch.download" ($.DefaultBranch)}}" data-variation="tiny inverted" data-position="top right">
|
|
<i class="download icon"></i>
|
|
<div class="menu">
|
|
<a class="item" href="{{$.RepoLink}}/archive/{{EscapePound $.DefaultBranch}}.zip"><i class="octicon octicon-file-zip"></i> ZIP</a>
|
|
<a class="item" href="{{$.RepoLink}}/archive/{{EscapePound $.DefaultBranch}}.tar.gz"><i class="octicon octicon-file-zip"></i> TAR.GZ</a>
|
|
</div>
|
|
</div>
|
|
</td>
|
|
</tr>
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
|
|
{{if gt (len .Branches) 1}}
|
|
<h4 class="ui top attached header">
|
|
{{.i18n.Tr "repo.branches"}}
|
|
</h4>
|
|
<div class="ui attached table segment">
|
|
<table class="ui very basic striped fixed table single line">
|
|
<tbody>
|
|
{{range .Branches}}
|
|
{{if ne .Name $.DefaultBranch}}
|
|
<tr>
|
|
<td class="six wide">
|
|
{{if .IsDeleted}}
|
|
<s><a href="{{$.RepoLink}}/src/branch/{{.Name | EscapePound}}">{{.Name}}</a></s>
|
|
<p class="info">{{$.i18n.Tr "repo.branch.deleted_by" .DeletedBranch.DeletedBy.Name}} {{TimeSinceUnix .DeletedBranch.DeletedUnix $.i18n.Lang}}</p>
|
|
{{else}}
|
|
{{if .IsProtected}}
|
|
<i class="octicon octicon-shield"></i>
|
|
{{end}}
|
|
<a href="{{$.RepoLink}}/src/branch/{{.Name | EscapePound}}">{{.Name}}</a>
|
|
<p class="info"><i class="octicon octicon-git-commit"></i><a href="{{$.RepoLink}}/commit/{{.Commit.ID.String}}">{{ShortSha .Commit.ID.String}}</a> · <span class="commit-message">{{RenderCommitMessage .Commit.CommitMessage $.RepoLink $.Repository.ComposeMetas}}</span> · {{$.i18n.Tr "org.repo_updated"}} {{TimeSince .Commit.Committer.When $.i18n.Lang}}</p>
|
|
{{end}}
|
|
</td>
|
|
<td class="three wide ui">
|
|
{{if not .IsDeleted}}
|
|
<div class="commit-divergence">
|
|
<div class="bar-group">
|
|
<div class="count count-behind">{{.CommitsBehind}}</div>
|
|
<div class="bar bar-behind" style="width: {{percentage .CommitsBehind .CommitsBehind .CommitsAhead}}%"></div>
|
|
</div>
|
|
<div class="bar-group">
|
|
<div class="count count-ahead">{{.CommitsAhead}}</div>
|
|
<div class="bar bar-ahead" style="width: {{percentage .CommitsAhead .CommitsBehind .CommitsAhead}}%"></div>
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
</td>
|
|
<td class="two wide right aligned">
|
|
{{if not .LatestPullRequest}}
|
|
{{if .IsIncluded}}
|
|
<a class="ui poping up orange small label" data-content="{{$.i18n.Tr "repo.branch.included_desc"}}" data-variation="tiny inverted" data-position="top right">
|
|
<i class="octicon octicon-git-pull-request"></i> {{$.i18n.Tr "repo.branch.included"}}
|
|
</a>
|
|
{{else if and (not .IsDeleted) $.AllowsPulls (gt .CommitsAhead 0)}}
|
|
<a href="{{$.RepoLink}}/compare/{{$.DefaultBranch | EscapePound}}...{{if ne $.Repository.Owner.Name $.Owner.Name}}{{$.Owner.Name}}:{{end}}{{.Name | EscapePound}}">
|
|
<button id="new-pull-request" class="ui compact basic button">{{$.i18n.Tr "repo.pulls.compare_changes"}}</button>
|
|
</a>
|
|
{{end}}
|
|
{{else if and .LatestPullRequest.HasMerged .MergeMovedOn}}
|
|
{{if and (not .IsDeleted) $.AllowsPulls (gt .CommitsAhead 0)}}
|
|
<a href="{{$.RepoLink}}/compare/{{$.DefaultBranch | EscapePound}}...{{if ne $.Repository.Owner.Name $.Owner.Name}}{{$.Owner.Name}}:{{end}}{{.Name | EscapePound}}">
|
|
<button id="new-pull-request" class="ui compact basic button">{{$.i18n.Tr "repo.pulls.compare_changes"}}</button>
|
|
</a>
|
|
{{end}}
|
|
{{else}}
|
|
<a href="{{$.RepoLink}}/pulls/{{.LatestPullRequest.Issue.Index}}">#{{.LatestPullRequest.Issue.Index}}</a>
|
|
{{if .LatestPullRequest.HasMerged}}
|
|
<a href="{{$.RepoLink}}/pulls/{{.LatestPullRequest.Issue.Index}}" class="ui purple small label"><i class="octicon octicon-git-pull-request"></i> {{$.i18n.Tr "repo.pulls.merged"}}</a>
|
|
{{else if .LatestPullRequest.Issue.IsClosed}}
|
|
<a href="{{$.RepoLink}}/pulls/{{.LatestPullRequest.Issue.Index}}" class="ui red small label"><i class="octicon octicon-issue-closed"></i> {{$.i18n.Tr "repo.issues.closed_title"}}</a>
|
|
{{else}}
|
|
<a href="{{$.RepoLink}}/pulls/{{.LatestPullRequest.Issue.Index}}" class="ui green small label"><i class="octicon octicon-issue-opened"></i> {{$.i18n.Tr "repo.issues.open_title"}}</a>
|
|
{{end}}
|
|
{{end}}
|
|
</td>
|
|
<td class="two wide right aligned overflow-visible">
|
|
{{if (not .IsDeleted)}}
|
|
<div class="ui basic jump dropdown icon button poping up" data-content="{{$.i18n.Tr "repo.branch.download" (.Name)}}" data-variation="tiny inverted" data-position="top right">
|
|
<i class="download icon"></i>
|
|
<div class="menu">
|
|
<a class="item" href="{{$.RepoLink}}/archive/{{EscapePound .Name}}.zip"><i class="octicon octicon-file-zip"></i> ZIP</a>
|
|
<a class="item" href="{{$.RepoLink}}/archive/{{EscapePound .Name}}.tar.gz"><i class="octicon octicon-file-zip"></i> TAR.GZ</a>
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
{{if and $.IsWriter (not $.IsMirror) (not $.Repository.IsArchived) (not .IsProtected)}}
|
|
{{if .IsDeleted}}
|
|
<a class="ui basic jump button icon poping up undo-button" href data-url="{{$.Link}}/restore?branch_id={{.DeletedBranch.ID | urlquery}}&name={{.DeletedBranch.Name | urlquery}}" data-content="{{$.i18n.Tr "repo.branch.restore" (.Name)}}" data-variation="tiny inverted" data-position="top right"><i class="octicon octicon-reply text blue"></i></a>
|
|
{{else}}
|
|
<a class="ui basic jump button icon poping up delete-branch-button" href data-url="{{$.Link}}/delete?name={{.Name | urlquery}}" data-content="{{$.i18n.Tr "repo.branch.delete" (.Name)}}" data-variation="tiny inverted" data-position="top right" data-name="{{.Name}}"><i class="trash icon text red"></i></a>
|
|
{{end}}
|
|
{{end}}
|
|
</td>
|
|
</tr>
|
|
{{end}}
|
|
{{end}}
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
</div>
|
|
|
|
<div class="ui small basic delete modal">
|
|
<div class="ui icon header">
|
|
<i class="trash icon"></i>
|
|
{{.i18n.Tr "repo.branch.delete_html"}} <span class="name"></span>
|
|
</div>
|
|
<div class="content">
|
|
<p>{{.i18n.Tr "repo.branch.delete_desc" | Str2html}}</p>
|
|
</div>
|
|
{{template "base/delete_modal_actions" .}}
|
|
</div>
|
|
{{template "base/footer" .}}
|