Don't show unnecessary error message to end users for DeleteBranchAfterMerge#35937
Merged
wxiaoguang merged 3 commits intogo-gitea:mainfrom Nov 12, 2025
Merged
Don't show unnecessary error message to end users for DeleteBranchAfterMerge#35937wxiaoguang merged 3 commits intogo-gitea:mainfrom
wxiaoguang merged 3 commits intogo-gitea:mainfrom
Conversation
GiteaBot
added
the
lgtm/need 2
TheFox0x7
approved these changes
Nov 12, 2025
GiteaBot
added
lgtm/need 1
silverwind
approved these changes
Nov 12, 2025
GiteaBot
added
lgtm/done
lunny
added
the
reviewed/wait-merge
GiteaBot
pushed a commit
to GiteaBot/gitea
that referenced
this pull request
Nov 12, 2025
GiteaBot
added
backport/done
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Nov 17, 2025
* giteaofficial/main: Fix diff blob excerpt expansion (go-gitea#35922) Add GITEA_PR_INDEX env variable to githooks (go-gitea#35938) Fix container push tag overwriting (go-gitea#35936) Upgrade deps golang.org/x/crypto (go-gitea#35952) Fix corrupted external render content (go-gitea#35946) Don't show unnecessary error message to end users for DeleteBranchAfterMerge (go-gitea#35937) Limit reading bytes instead of ReadAll (go-gitea#35928)
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Nov 24, 2025
* giteaofficial/release/v1.25: (77 commits) Add "site admin" back to profile menu (go-gitea#36010) (go-gitea#36013) release notes for 1.25.2 (go-gitea#35986) Allow empty commit when merging pull request with squash style (go-gitea#35989) (go-gitea#36003) Fix various permission & login related bugs (go-gitea#36002) (go-gitea#36004) upgrade golang.org/x/crypto to 0.45.0 (go-gitea#35988) Change project default column icon to 'star' (go-gitea#35967) (go-gitea#35979) Misc CSS fixes (go-gitea#35888) (go-gitea#35981) Fix container push tag overwriting (go-gitea#35936) (go-gitea#35954) Fix corrupted external render content (go-gitea#35946) (go-gitea#35950) Don't show unnecessary error message to end users for DeleteBranchAfterMerge (go-gitea#35937) (go-gitea#35941) Limit read bytes instead of ReadAll (go-gitea#35928) (go-gitea#35934) Load jQuery as early as possible to support custom scripts (go-gitea#35926) (go-gitea#35929) Allow to display embed images/pdfs when SERVE_DIRECT was enabled on MinIO storage (go-gitea#35882) (go-gitea#35917) Use correct form field for allowed force push users in branch protection API (go-gitea#35894) (go-gitea#35908) Make OAuth2 issuer configurable (go-gitea#35915) (go-gitea#35916) Fix go-gitea#35763: Add proper page title for project pages (go-gitea#35773) (go-gitea#35909) Display source code downloads last for release attachments (go-gitea#35897) (go-gitea#35903) Fix team member access check (go-gitea#35899) (go-gitea#35905) Fix conda null depend issue (go-gitea#35900) (go-gitea#35902) Fix avatar upload error handling (go-gitea#35887) (go-gitea#35890) ... # Conflicts: # go.mod # go.sum # models/actions/run_test.go # models/fixtures/action_run.yml # models/fixtures/action_run_job.yml # models/fixtures/action_task.yml # models/fixtures/branch.yml # models/fixtures/repo_unit.yml # modules/git/tree_entry_gogit.go # modules/git/tree_gogit.go # routers/web/repo/actions/view.go # routers/web/repo/issue_comment.go # services/actions/workflow.go # services/doctor/actions_test.go # services/pull/comment.go # services/pull/pull.go # services/pull/temp_repo.go # templates/base/head_navbar.tmpl # templates/swagger/v1_json.tmpl # tests/integration/actions_schedule_test.go # tests/integration/git_lfs_ssh_test.go # tests/integration/pull_create_test.go # tests/integration/pull_merge_test.go # tests/sqlite.ini.tmpl # web_src/js/components/ContextPopup.vue
Closed
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.
5 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 the issue report from discord