Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

@zeripath
Copy link
Contributor

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

* 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 go-gitea#11981

Signed-off-by: Andrew Thornton <[email protected]>

* Update web_src/js/vendor/gitgraph.js
@zeripath zeripath added this to the 1.12.1 milestone Jun 20, 2020
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jun 20, 2020
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jun 21, 2020
@zeripath zeripath merged commit 82b843a into go-gitea:release/v1.12 Jun 21, 2020
@zeripath zeripath deleted the backport-11996 branch June 21, 2020 15:08
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants