zeripath 82b843a5ab

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>

2020-06-21 16:08:25 +01:00

..

branch

Allow unauthenticated users to compare (#11240)

2020-05-04 19:44:30 -03:00

diff

Fix to allow comment poster to edit or delete his own comments (#11671) (#11774)

2020-06-06 17:43:01 -04:00

editor

Allow different HardBreaks settings for documents and comments (#11515) (#11599)

2020-05-24 11:45:56 +01:00

issue

Fix search form button overlap (#11840) (#11864)

2020-06-12 13:23:13 +01:00

pulls

Prettify timeline 3 (#11139)

2020-05-14 15:15:21 -04:00

release

Prettify timeline 3 (#11139)

2020-05-14 15:15:21 -04:00

settings

Fix webhook template when validation errors occur (#11421)

2020-05-15 22:02:46 +03:00

wiki

Fix images in wiki edit preview (#11546) (#11602)

2020-05-24 14:01:10 +01:00

activity.tmpl

Remove last traces of has-emoji class (#11263)

2020-05-01 20:58:45 +03:00

blame.tmpl

Remove last traces of has-emoji class (#11263)

2020-05-01 20:58:45 +03:00

branch_dropdown.tmpl

…

commit_page.tmpl

Fix styling for commiter on diff view (#11715) (#11744)

2020-06-03 09:29:19 +01:00

commit_status.tmpl

…

commits_list.tmpl

Support view individual commit for wiki pages (#11415)

2020-05-16 19:38:40 +03:00

commits_table.tmpl

…

commits.tmpl

…

create.tmpl

Global default branch setting (#11918) (#11937)

2020-06-17 19:32:06 -04:00

empty.tmpl

Global default branch setting (#11918) (#11937)

2020-06-17 19:32:06 -04:00

forks.tmpl

…

graph.tmpl

Handle multiple merges in gitgraph.js (#11996) (#12000)

2020-06-21 16:08:25 +01:00

header.tmpl

…

home.tmpl

Allow unauthenticated users to compare (#11240)

2020-05-04 19:44:30 -03:00

migrate.tmpl

…

migrating.tmpl

…

search.tmpl

…

sub_menu.tmpl

…

user_cards.tmpl

…

view_file.tmpl

Remove last traces of has-emoji class (#11263)

2020-05-01 20:58:45 +03:00

view_list.tmpl

Fix reply octicon (#11821) (#11822)

2020-06-09 12:25:32 -05:00

watchers.tmpl

…