Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the admin mailer config display #20633

Merged
merged 1 commit into from
Aug 2, 2022

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Aug 2, 2022

Follows #18982 , the MailerType was removed, so it should use Protocol instead, otherwise there will be 500 error.

And some legacy problems have been fixed (eg: the .DisableHelo should be .Mailer.Xxx, the text should be Mailer Configuration instead of SMTP Mailer Configuration).

See the screenshots.

There are a lot of config options, not all of them are shown (as before)

Dummy

image

Sendmail

image

SMTP

image

@wxiaoguang wxiaoguang added type/bug skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. labels Aug 2, 2022
@wxiaoguang wxiaoguang added this to the 1.18.0 milestone Aug 2, 2022
@wULLSnpAXbWZGYDYyhWTKKspEQoaYxXyhoisqHf
Copy link
Contributor

lemme try this out..

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Aug 2, 2022
Copy link
Contributor

Choose a reason for hiding this comment

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

I'd approve (again) if I had rights..

I built Gitea with this patch and it fixes the issue for me, admin page is back and I was able to send a "test email".

Thanks for a lighning-fast fix! @wxiaoguang

@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 2, 2022
@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 2, 2022
@wxiaoguang wxiaoguang merged commit 90b2657 into go-gitea:main Aug 2, 2022
@wxiaoguang wxiaoguang deleted the fix-admin-config-mailer branch August 2, 2022 16:43
zjjhot added a commit to zjjhot/gitea that referenced this pull request Aug 3, 2022
* giteaofficial/main:
  [skip ci] Updated translations via Crowdin
  Use `strings.Cut` for GIT_PROTOCOL value (go-gitea#20638)
  Fix the admin mailer config display (go-gitea#20633)
  Use correct page size for link header pagination (go-gitea#20546)
  Fix package upload for files >32mb (go-gitea#20622)
  Add info about Wire 2 when Git over SSH (go-gitea#20619)
  Enable Wire 2 for Internal SSH Server (go-gitea#20616)
vsysoev pushed a commit to IntegraSDL/gitea that referenced this pull request Aug 10, 2022
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
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. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants