zeripath a07cc0df76

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

2020-06-20 22:29:44 +03: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)

2020-06-05 13:10:10 +03:00

editor

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

2020-05-24 09:14:26 +01:00

issue

Update Fomantic-UI to 2.8.6 and remove old workarounds (#11933)

2020-06-17 21:20:07 -04:00

pulls

Prettify timeline 3 (#11139)

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

release

Add compare link to releases (#11752)

2020-06-05 14:44:54 -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)

2020-05-24 11:41:33 +01:00

activity.tmpl

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

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

blame.tmpl

Rework blame template and styling (#11885)

2020-06-15 14:39:39 -04:00

branch_dropdown.tmpl

Add Octicon SVG spritemap (#10107)

2020-02-11 12:02:41 -05:00

commit_page.tmpl

Show exact tag for commit on diff view (#11846)

2020-06-11 15:42:55 -04:00

commit_status.tmpl

UI: Fix overflow issues in repo (#7190)

2019-06-14 09:32:13 +08:00

commits_list_small.tmpl

Fix message wrapping on PR commit list (#11616)

2020-06-03 09:30:34 +01:00

commits_list.tmpl

Show full GPG commit status on PR commit history (#11702)

2020-06-02 20:22:26 -04:00

commits_table.tmpl

Add Octicon SVG spritemap (#10107)

2020-02-11 12:02:41 -05:00

commits.tmpl

Add Octicon SVG spritemap (#10107)

2020-02-11 12:02:41 -05:00

create.tmpl

Global default branch setting (#11918)

2020-06-17 16:53:55 -04:00

empty.tmpl

Global default branch setting (#11918)

2020-06-17 16:53:55 -04:00

forks.tmpl

#3348 always use relative avatar link in the template

2016-08-05 12:12:54 -07:00

graph.tmpl

Handle multiple merges in gitgraph.js (#11996)

2020-06-20 22:29:44 +03:00

header_icon.tmpl

Fix repo internal icon when avatar is present (#11873)

2020-06-13 00:24:41 +03:00

header.tmpl

Fix repo internal icon when avatar is present (#11873)

2020-06-13 00:24:41 +03:00

home.tmpl

Rework blame template and styling (#11885)

2020-06-15 14:39:39 -04:00

migrate.tmpl

Allow site admin to disable mirrors (#11740)

2020-06-02 21:21:38 -04:00

migrating.tmpl

[assets] configurable URL for static resources (#7911)

2019-10-22 20:11:01 +08:00

search.tmpl

ui: fix status label on branches list vertical alignment (#11109)

2020-04-17 12:35:12 -04:00

shabox_badge.tmpl

Show full GPG commit status on PR commit history (#11702)

2020-06-02 20:22:26 -04:00

sub_menu.tmpl

UI: Fix wrong closing tag (#11910)

2020-06-16 11:27:20 -04:00

user_cards.tmpl

Add Octicon SVG spritemap (#10107)

2020-02-11 12:02:41 -05:00

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)

2020-06-09 10:13:00 -05:00

watchers.tmpl

#1692 APIs: Users Followers

2015-12-21 04:24:11 -08:00