Fix atom/rss mixed error#35345
Merged
techknowlogick merged 3 commits intogo-gitea:mainfrom Aug 23, 2025
Merged
Conversation
GiteaBot
added
the
lgtm/need 2
techknowlogick
approved these changes
Aug 23, 2025
Member
techknowlogick
left a comment
techknowlogick
left a comment
There was a problem hiding this comment.
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
added
lgtm/need 1
delvh
approved these changes
Aug 23, 2025
GiteaBot
added
lgtm/done
GiteaBot
pushed a commit
to GiteaBot/gitea
that referenced
this pull request
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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix #35342