Skip to content

Conversation

@zeripath
Copy link
Contributor

@zeripath zeripath commented Jun 24, 2020

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

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>
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 24, 2020
zeripath and others added 2 commits June 24, 2020 23:11
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jun 24, 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 25, 2020
@lafriks lafriks merged commit 0b1bb96 into go-gitea:master Jun 25, 2020
@lafriks
Copy link
Member

lafriks commented Jun 25, 2020

Please send backport

@zeripath zeripath deleted the damaged-graph-2 branch July 1, 2020 13:11
zeripath added a commit to zeripath/gitea that referenced this pull request Jul 1, 2020
* 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 the backport/done All backports for this PR have been created label Jul 1, 2020
zeripath added a commit that referenced this pull request Jul 2, 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>
ydelafollye pushed a commit to ydelafollye/gitea that referenced this pull request Jul 31, 2020
* 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>
@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

backport/done All backports for this PR have been created 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.

Damaged graph

6 participants