Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix gitgraph branch continues after merge (#12044) #12105

Merged
merged 3 commits into from
Jul 2, 2020

Conversation

zeripath
Copy link
Contributor

@zeripath zeripath commented Jul 1, 2020

Backport #12044

  • Fix gitgraph branch continues after merge

After fixing the initial problem in #11981 another
problem has come to light...

Fix #11981 (part 2)

Signed-off-by: Andrew Thornton art27@cantab.net

  • Update web_src/js/vendor/gitgraph.js

  • Apply suggestions from code review

Co-authored-by: silverwind me@silverwind.io

* Fix gitgraph branch continues after merge

After fixing the initial problem in go-gitea#11981 another
problem has come to light...

Fix go-gitea#11981 (part 2)

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Update web_src/js/vendor/gitgraph.js

* Apply suggestions from code review

Co-authored-by: silverwind <me@silverwind.io>

Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
@zeripath zeripath added this to the 1.12.2 milestone Jul 1, 2020
@GiteaBot GiteaBot added the lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. label Jul 1, 2020
@zeripath
Copy link
Contributor Author

zeripath commented Jul 2, 2020

make lg-tm work

@zeripath zeripath merged commit 058ee52 into go-gitea:release/v1.12 Jul 2, 2020
@zeripath zeripath deleted the backport-12044 branch July 2, 2020 10:46
@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