diff options
| author | zeripath <art27@cantab.net> | 2020-06-20 20:29:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-20 22:29:44 +0300 |
| commit | a07cc0df76056ce2be1d8a89f38416cf511dd03b (patch) | |
| tree | e2cf2c20d5134d301d2f37dd9bf9b3d135529d00 /templates | |
| parent | d31a9c544ff8c81229e7a290006a6e85d9004930 (diff) | |
| download | gitea-a07cc0df76056ce2be1d8a89f38416cf511dd03b.tar.gz gitea-a07cc0df76056ce2be1d8a89f38416cf511dd03b.zip | |
Handle multiple merges in gitgraph.js (#11996)
* Handle multiple merges in gitgraph.js
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>
* Update web_src/js/vendor/gitgraph.js
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/graph.tmpl | 64 |
1 files changed, 31 insertions, 33 deletions
diff --git a/templates/repo/graph.tmpl b/templates/repo/graph.tmpl index 5f4d9f1d62..493ac7a696 100644 --- a/templates/repo/graph.tmpl +++ b/templates/repo/graph.tmpl @@ -2,39 +2,37 @@ <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 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" .}} |