]> source.dussan.org Git - gitea.git/commit
projects / gitea.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: dcbbf37) | patch
Handle multiple merges in gitgraph.js (#11996) (#12000)
authorzeripath <art27@cantab.net>
Sun, 21 Jun 2020 15:08:25 +0000 (16:08 +0100)
committerGitHub <noreply@github.com>
Sun, 21 Jun 2020 15:08:25 +0000 (16:08 +0100)
commit82b843a5ab15b3563a7f31d5ef57ea12ec035685
tree34817f40ac0f98c90f026cc8a5cbb6222a4763f7tree | snapshot
parentdcbbf37082898dbca8bc3e5f1e3003c56955a675commit | diff
Handle multiple merges in gitgraph.js (#11996) (#12000)

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>
templates/repo/graph.tmpl diff | blob | history
web_src/js/vendor/gitgraph.js diff | blob | history
Git with a cup of tea! Painless self-hosted all-in-one software development service, including Git hosting, code review, team collaboration, package registry and CI/CD: https://github.com/go-gitea/gitea