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 missing repo link in issue/pull assigned emails #17183

Merged

Conversation

zeripath
Copy link
Contributor

There was a mistake in the template file: templates/mail/issue/assigned.tmpl
where the repourl was generated from a non-existent release instead of the issue.

This PR changes this to use the issue but also ensure that the issue repo is loaded.

It also slightly improves the English locale string.

Fix #17160

Signed-off-by: Andrew Thornton art27@cantab.net

There was a mistake in the template file: `templates/mail/issue/assigned.tmpl`
where the repourl was generated from a non-existent release instead of the issue.

This PR changes this to use the issue but also ensure that the issue repo is loaded.

It also slightly improves the English locale string.

Fix go-gitea#17160

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath force-pushed the fix-17160-use-issue-for-repo-in-mail-templates branch from 1898c3c to 9e3438d Compare September 29, 2021 16:51
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Sep 29, 2021
@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 29, 2021
zeripath added a commit to zeripath/gitea that referenced this pull request Sep 29, 2021
Backport go-gitea#17183

There was a mistake in the template file: `templates/mail/issue/assigned.tmpl`
where the repourl was generated from a non-existent release instead of the issue.

This PR changes this to use the issue but also ensure that the issue repo is loaded.

It also slightly improves the English locale string.

Fix go-gitea#17160

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath added the backport/done All backports for this PR have been created label Sep 29, 2021
services/mailer/mail.go Outdated Show resolved Hide resolved
@codecov-commenter
Copy link

Codecov Report

Merging #17183 (2b57144) into main (ecfac78) will decrease coverage by 0.01%.
The diff coverage is 0.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main   #17183      +/-   ##
==========================================
- Coverage   45.31%   45.30%   -0.02%     
==========================================
  Files         779      779              
  Lines       87226    87229       +3     
==========================================
- Hits        39530    39520      -10     
- Misses      41285    41290       +5     
- Partials     6411     6419       +8     
Impacted Files Coverage Δ
services/mailer/mail.go 62.54% <0.00%> (-0.72%) ⬇️
models/gpg_key_common.go 59.67% <0.00%> (-4.84%) ⬇️
modules/notification/mail/mail.go 35.29% <0.00%> (-2.95%) ⬇️
modules/process/manager.go 72.83% <0.00%> (-2.47%) ⬇️
modules/queue/queue_channel.go 95.00% <0.00%> (-1.67%) ⬇️
modules/notification/ui/ui.go 60.86% <0.00%> (-1.45%) ⬇️
models/notification.go 65.28% <0.00%> (-0.88%) ⬇️
modules/queue/queue_bytefifo.go 59.28% <0.00%> (-0.60%) ⬇️
services/pull/pull.go 41.78% <0.00%> (ø)
models/issue_comment.go 51.90% <0.00%> (ø)
... and 3 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ecfac78...2b57144. Read the comment docs.

@6543 6543 merged commit ddd3586 into go-gitea:main Sep 29, 2021
6543 added a commit that referenced this pull request Sep 29, 2021
Backport #17183

There was a mistake in the template file: `templates/mail/issue/assigned.tmpl`
where the repourl was generated from a non-existent release instead of the issue.

This PR changes this to use the issue but also ensure that the issue repo is loaded.

It also slightly improves the English and the Russian locale string.

Fix #17160

Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: 6543 <6543@obermui.de>
@zeripath zeripath deleted the fix-17160-use-issue-for-repo-in-mail-templates branch September 30, 2021 06:10
@go-gitea go-gitea locked and limited conversation to collaborators Apr 28, 2022
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 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

%!s() instead of repo name in email
8 participants