82b843a5ab
Backport #11996 There is a bug in web_src/js/vendor/gitgraph.js whereby it fails to handle multiple merges in a single commit correctly. This PR adds changes to make this work. Fix #11981 Signed-off-by: Andrew Thornton <art27@cantab.net>
39 lines
1.1 KiB
Cheetah
39 lines
1.1 KiB
Cheetah
{{template "base/head" .}}
|
|
<div class="repository commits">
|
|
{{template "repo/header" .}}
|
|
<div class="ui container">
|
|
<div id="git-graph-container" class="ui segment">
|
|
<h1>{{.i18n.Tr "repo.commit_graph"}}</h1>
|
|
<div id="rel-container">
|
|
<canvas id="graph-canvas">
|
|
<ul id="graph-raw-list">
|
|
{{ range .Graph }}
|
|
<li><span class="node-relation">{{ .GraphAcii -}}</span></li>
|
|
{{ end }}
|
|
</ul>
|
|
</canvas>
|
|
</div>
|
|
<div id="rev-container">
|
|
<ul id="rev-list">
|
|
{{ range .Graph }}
|
|
<li>
|
|
{{ if .OnlyRelation }}
|
|
<span />
|
|
{{ else }}
|
|
<code id="{{.ShortRev}}">
|
|
<a href="{{AppSubUrl}}/{{$.Username}}/{{$.Reponame}}/commit/{{.Rev}}">{{ .ShortRev}}</a>
|
|
</code>
|
|
<strong> {{.Branch}}</strong>
|
|
<span>{{RenderCommitMessage .Subject $.RepoLink $.Repository.ComposeMetas}}</span> by
|
|
<span class="author">{{.Author}}</span>
|
|
<span class="time">{{.Date}}</span>
|
|
{{ end }}
|
|
</li>
|
|
{{ end }}
|
|
</ul>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
{{template "base/paginate" .}}
|
|
{{template "base/footer" .}}
|