Skip to content

Conversation

@wxiaoguang
Copy link
Contributor

No description provided.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Aug 28, 2025
@wxiaoguang wxiaoguang added this to the 1.25.0 milestone Aug 28, 2025
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Aug 28, 2025
@wxiaoguang wxiaoguang added skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. and removed modifies/go Pull requests that update Go code labels Aug 28, 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 Aug 28, 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 Aug 28, 2025
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Aug 28, 2025
@wxiaoguang wxiaoguang enabled auto-merge (squash) August 28, 2025 09:18
@wxiaoguang wxiaoguang added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Aug 28, 2025
@wxiaoguang wxiaoguang merged commit dca1af7 into go-gitea:main Aug 28, 2025
26 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Aug 28, 2025
@wxiaoguang wxiaoguang deleted the fix-db-ctx branch August 28, 2025 09:52
hiifong added a commit to hiifong/gitea that referenced this pull request Aug 31, 2025
* main: (34 commits)
  when sorting issues by nearest due date, issues without due date should be sorted ascending (go-gitea#35267)
  [skip ci] Updated translations via Crowdin
  Upgrade xz to v0.5.15 (go-gitea#35377)
  Refactor db package (go-gitea#35380)
  Remove the duplicated function GetTags (go-gitea#35375)
  [skip ci] Updated translations via Crowdin
  Allow foreachref parser to grow its buffer (go-gitea#35365)
  Remove global context from db package (go-gitea#35371)
  Use gitrepo.SetDefaultBranch when set default branch of wiki repository (go-gitea#33911)
  Deleting branch could delete broken branch which has database record but git branch is missing (go-gitea#35360)
  Remove incorrect "db.DefaultContext" usages (go-gitea#35366)
  Refactor to use reflect.TypeFor (go-gitea#35370)
  [skip ci] Updated translations via Crowdin
  Remove wrong "git.DefaultContext" (go-gitea#35364)
  Fix context usages (go-gitea#35348)
  Instance signing rule `pubkey` should allow all public keys, not just GPG (go-gitea#35357)
  Allow deleting comment with content via API like web did (go-gitea#35346)
  Prevent duplicate actions email (go-gitea#35215)
  rename nightly docker tag for main branch (go-gitea#35344)
  Fix atom/rss mixed error (go-gitea#35345)
  ...

# Conflicts:
#	tests/integration/pull_merge_test.go
zjjhot added a commit to zjjhot/gitea that referenced this pull request Sep 1, 2025
* giteaofficial/main:
  [skip ci] Updated translations via Crowdin
  when sorting issues by nearest due date, issues without due date should be sorted ascending (go-gitea#35267)
  [skip ci] Updated translations via Crowdin
  Upgrade xz to v0.5.15 (go-gitea#35377)
  Refactor db package (go-gitea#35380)
  Remove the duplicated function GetTags (go-gitea#35375)
  [skip ci] Updated translations via Crowdin
  Allow foreachref parser to grow its buffer (go-gitea#35365)
  Remove global context from db package (go-gitea#35371)
  Use gitrepo.SetDefaultBranch when set default branch of wiki repository (go-gitea#33911)
  Deleting branch could delete broken branch which has database record but git branch is missing (go-gitea#35360)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Nov 26, 2025
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. modifies/go Pull requests that update Go code 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.

4 participants