Skip to content

Fix error handling in mailer and wiki services#36041

Merged
silverwind merged 3 commits into
go-gitea:mainfrom
hamkido:main
Nov 28, 2025
Merged

Fix error handling in mailer and wiki services#36041
silverwind merged 3 commits into
go-gitea:mainfrom
hamkido:main

Conversation

@hamkido
Copy link
Copy Markdown
Contributor

@hamkido hamkido commented Nov 27, 2025

  • Updated error message in incoming.go to remove unnecessary wrapping of the error.
  • Corrected typo in error message in wiki.go for clarity.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Nov 27, 2025
- Updated error message in `incoming.go` to remove unnecessary wrapping of the error.
- Corrected typo in error message in `wiki.go` for clarity.
- Replaced fmt.Errorf with errors.New for improved error handling in incoming.go.
- Updated error message to enhance clarity.
@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 Nov 27, 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 Nov 27, 2025
@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Nov 28, 2025
@silverwind silverwind enabled auto-merge (squash) November 28, 2025 00:02
@silverwind silverwind merged commit a36951a into go-gitea:main Nov 28, 2025
23 checks passed
@GiteaBot GiteaBot added this to the 1.26.0 milestone Nov 28, 2025
zjjhot added a commit to zjjhot/gitea that referenced this pull request Nov 28, 2025
* giteaofficial/main:
  Fix error handling in mailer and wiki services (go-gitea#36041)
  Update JS deps, fix deprecations (go-gitea#36040)
  Fix incorrect viewed files counter if file has changed (go-gitea#36009)
  [skip ci] Updated translations via Crowdin
  Fix actions lint (go-gitea#36029)
  Fix oauth2 session gob register (go-gitea#36017)
@lunny lunny added the backport/v1.25 This PR should be backported to Gitea 1.25 label Nov 28, 2025
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Nov 28, 2025
GiteaBot added a commit to GiteaBot/gitea that referenced this pull request Nov 28, 2025
- Updated error message in `incoming.go` to remove unnecessary wrapping
of the error.
- Corrected typo in error message in `wiki.go` for clarity.

---------

Co-authored-by: Giteabot <teabot@gitea.io>
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Nov 28, 2025
lunny pushed a commit that referenced this pull request Nov 29, 2025
Backport #36041 by @hamkido

- Updated error message in `incoming.go` to remove unnecessary wrapping
of the error.
- Corrected typo in error message in `wiki.go` for clarity.

Co-authored-by: hamkido <hamki.do2000@gmail.com>
silverwind added a commit to silverwind/gitea that referenced this pull request Dec 2, 2025
* origin/main:
  [skip ci] Updated translations via Crowdin
  Fix bug when updating user email (go-gitea#36058)
  Add "Go to file", "Delete Directory" to repo file list page (go-gitea#35911)
  Replace `lint-go-gopls` with additional `govet` linters (go-gitea#36028)
  Fix Actions `pull_request.paths` being triggered incorrectly by rebase (go-gitea#36045)
  Fix error handling in mailer and wiki services (go-gitea#36041)
  Update JS deps, fix deprecations (go-gitea#36040)
  Fix incorrect viewed files counter if file has changed (go-gitea#36009)
@xnox xnox mentioned this pull request Dec 7, 2025
pimpale pushed a commit to hud-evals/gitea that referenced this pull request Dec 14, 2025
- Updated error message in `incoming.go` to remove unnecessary wrapping
of the error.
- Corrected typo in error message in `wiki.go` for clarity.

---------

Co-authored-by: Giteabot <teabot@gitea.io>
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Feb 26, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

backport/done All backports for this PR have been created backport/v1.25 This PR should be backported to Gitea 1.25 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants