You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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
4 years ago
..
components Insert ui divider directly in templates instead of from inside heatmap vue component (#11508) 4 years ago
features Replace jquery-datetimepicker with native date input (#11684) 4 years ago
standalone Reorganize frontend files and tooling (#10168) 4 years ago
vendor Handle multiple merges in gitgraph.js (#11996) 4 years ago
index.js Don't add same line code comment box twice (#11837) 4 years ago
jquery.js Upgrade jQuery to 3.5.0, remove jQuery-Migrate, fix deprecations (#11055) 4 years ago
publicpath.js Fix webpack chunk loading with STATIC_URL_PREFIX (#11526) 4 years ago
serviceworker.js Fix serviceworker output file and misc improvements (#11562) 4 years ago
utils.js Move tributejs to npm/webpack (#11497) 4 years ago