Skip to content

Refactor and update mail templates #35150

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 60 commits into from
Sep 5, 2025
Merged

Refactor and update mail templates #35150

merged 60 commits into from
Sep 5, 2025
+169 −124

Conversation

NorthRealm
Copy link
Contributor

@NorthRealm NorthRealm commented Jul 23, 2025 •
edited
Loading

  • Moved mail templates to new directories.
  • Added new devtest ymls.
  • Embedded styles as much as possible.
  • Added new translation keys for actions email.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 23, 2025
@github-actions github-actions bot added modifies/translation modifies/go Pull requests that update Go code modifies/templates This PR modifies the template files labels Jul 23, 2025
@lunny lunny added this to the 1.25.0 milestone Jul 23, 2025
delvh
delvh reviewed Jul 24, 2025
View reviewed changes
@NorthRealm NorthRealm force-pushed the patch-mail-templates-1 branch from e1d2ca4 to 3ff5727 Compare July 24, 2025 12:04
@NorthRealm NorthRealm requested a review from delvh July 25, 2025 06:26
NorthRealm and others added 3 commits July 27, 2025 12:41
@NorthRealm
Merge branch 'main' into patch-mail-templates-1
08e9d8b
@NorthRealm
Merge branch 'main' into patch-mail-templates-1
d767417
@NorthRealm @delvh
R
77f0fb6 
Co-authored-by: delvh <dev.lh@web.de>
Signed-off-by: NorthRealm <155140859+NorthRealm@users.noreply.github.com>
wxiaoguang
wxiaoguang previously requested changes Jul 27, 2025
View reviewed changes
Copy link
Contributor

@wxiaoguang wxiaoguang left a comment

Choose a reason for hiding this comment

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

templates/mail/footer_gitea.tmpl is not right

@GiteaBot GiteaBot added lgtm/blocked A maintainer has reservations with the PR and thus it cannot be merged and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jul 27, 2025
@NorthRealm NorthRealm requested a review from wxiaoguang July 27, 2025 09:49
wxiaoguang
wxiaoguang reviewed Jul 27, 2025
View reviewed changes
Copy link
Contributor

@wxiaoguang wxiaoguang left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Still not right, footer_view_on_gitea.tmpl is not right either. The HTML layouts are wrong, and it is fragile by passing all variables "." to sub-templates (In history many 500 errors were caused by that).

Recently I don't have time to do further reviews for PRs, other maintainers could help to review and improve, and feel free to dismiss the "change request" if the concerns have been addressed.

delvh
delvh reviewed Jul 27, 2025
View reviewed changes
@NorthRealm

This comment was marked as outdated.

Sign in to view
@NorthRealm NorthRealm closed this Jul 27, 2025
@NorthRealm NorthRealm deleted the patch-mail-templates-1 branch July 27, 2025 12:32
@lunny lunny added this to the 1.25.0 milestone Aug 19, 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 Sep 2, 2025
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Sep 4, 2025
@lunny lunny merged commit 0734763 into go-gitea:main Sep 5, 2025
26 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Sep 5, 2025
zjjhot added a commit to zjjhot/gitea that referenced this pull request Sep 5, 2025
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
ecd783c 
* giteaofficial/main:
  Refactor and update mail templates (go-gitea#35150)
  Disable Field count validation of CSV viewer (go-gitea#35228)
  split admin config settings templates to make it maintain easier (go-gitea#35294)
  Update tools/package.json dependencies, remove imagemin-zopfli (go-gitea#35406)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wxiaoguang wxiaoguang wxiaoguang left review comments

@lunny lunny lunny approved these changes

@delvh delvh Awaiting requested review from delvh

+1 more reviewer

@hiifong hiifong hiifong approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
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 modifies/templates This PR modifies the template files modifies/translation type/refactoring Existing code has been cleaned up. There should be no new functionality.
Projects
None yet
Milestone
1.25.0
Development

Successfully merging this pull request may close these issues.
6 participants
@NorthRealm @wxiaoguang @lunny @delvh @hiifong @GiteaBot