Skip to content

Conversation

lunny
Copy link
Member

@lunny lunny commented Aug 23, 2025

Fix #35342

@lunny lunny added type/bug backport/v1.24 This PR should be backported to Gitea 1.24 labels Aug 23, 2025
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Aug 23, 2025
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Aug 23, 2025
Copy link
Member

@techknowlogick techknowlogick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could probably be simplified to reduce the duplication of the conditional statements, but it solves the issue so I'll give it a +1
I'll see if I can push up a refactor

@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 23, 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 23, 2025
@techknowlogick techknowlogick enabled auto-merge (squash) August 23, 2025 22:03
@techknowlogick techknowlogick merged commit 3a969a5 into go-gitea:main Aug 23, 2025
26 checks passed
@GiteaBot GiteaBot added this to the 1.25.0 milestone Aug 23, 2025
@lunny lunny deleted the lunny/fix_atom_rss branch August 23, 2025 22:44
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Aug 24, 2025
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Aug 24, 2025
zjjhot added a commit to zjjhot/gitea that referenced this pull request Aug 25, 2025
* giteaofficial/main:
  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)
  Remove deprecated auth sources (go-gitea#35272)
  Always return the relevant status information, even if no status exists. (go-gitea#35335)
  [skip ci] Updated translations via Crowdin
  Upgrade mermaid from 11.9.0 to 11.10.0 (go-gitea#35329)
  Use configurable remote name for git commands (go-gitea#35172)
silverwind pushed a commit that referenced this pull request Aug 26, 2025
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
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/v1.24 This PR should be backported to Gitea 1.24 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.

branch commits atom feed url replies in rss format, not atom
4 participants