Skip to content

Conversation

@lunny
Copy link
Member

@lunny lunny commented Dec 25, 2025

Fix #36239

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 25, 2025
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Dec 25, 2025
@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 Dec 25, 2025
@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 Dec 25, 2025
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Dec 26, 2025
@lunny lunny merged commit ff3d68b into go-gitea:main Dec 26, 2025
24 checks passed
@GiteaBot GiteaBot added this to the 1.26.0 milestone Dec 26, 2025
@lunny lunny deleted the lunny/fix_nil_blob branch December 26, 2025 03:26
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Dec 26, 2025
zjjhot added a commit to zjjhot/gitea that referenced this pull request Dec 26, 2025
* giteaofficial/main:
  Fix panic when get editor config file (go-gitea#36241)
  Refactor compare router param parse (go-gitea#36105)
  [skip ci] Updated translations via Crowdin
  Use flatten translation keys (go-gitea#36225)
  Replace CSRF cookie with `CrossOriginProtection` (go-gitea#36183)
  Remove fomantic form module (go-gitea#36222)
  Fix panic in blame view when a file has only a single commit (go-gitea#36230)
  fix: spelling error in migrate-storage cmd utility (go-gitea#36226)

# Conflicts:
#	templates/user/settings/security/twofa.tmpl
@GiteaBot
Copy link
Collaborator

I was unable to create a backport for 1.25. @lunny, please send one manually. 🍵

go run ./contrib/backport 36241
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Dec 26, 2025
lunny added a commit to lunny/gitea that referenced this pull request Dec 26, 2025
@lunny lunny added the backport/done All backports for this PR have been created label Dec 26, 2025
lunny added a commit that referenced this pull request Dec 28, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! backport/v1.25 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code type/bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Get 500 error with panic on accessing repo from webui

4 participants