Skip to content

Conversation

@lunny
Copy link
Member

@lunny lunny commented May 30, 2023

Fix #24996
Caused by #24634

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 30, 2023
@lunny lunny added skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. size/XS labels May 30, 2023
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label May 30, 2023
@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 May 30, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 30, 2023
@lunny lunny merged commit faae819 into go-gitea:main May 30, 2023
@GiteaBot GiteaBot added this to the 1.20.0 milestone May 30, 2023
@lunny lunny deleted the lunny/fix_tmpl_break branch May 30, 2023 13:37
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 30, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 31, 2023
* upstream/main:
  Remove the service worker (go-gitea#25010)
  Add user level action runners (go-gitea#24995)
  Update github.com/google/go-github to v52 (go-gitea#24004)
  various style fixes (go-gitea#25008)
  Add show timestamp/seconds and fullscreen options to action page (go-gitea#24876)
  Fix markdown link to awesome gitea (go-gitea#25009)
  Followup to pinned Issues (go-gitea#24945)
  revert the removed method to fix tmpl break on graph page (go-gitea#25005)
  Refactor diffFileInfo / DiffTreeStore  (go-gitea#24998)
  Fix delete user account modal (go-gitea#25004)
  Clean up github actions (go-gitea#24984)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 28, 2023
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. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Commit Graph not working

4 participants