Prevent merge messages from being sorted to the top of email chains #18566
Conversation
This file contains 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
Gitea will currrently resend the same message-id for the closed/merged/reopened messages for issues. This will cause the merged message to leap to the top of an email chain and become out of sync. This PR adds specific suffices for these actions. Fix go-gitea#18560 Signed-off-by: Andrew Thornton <[email protected]>
6543
approved these changes
Feb 3, 2022
GiteaBot
added
the
lgtm/need 1
singuliere
suggested changes
Feb 3, 2022
There was a problem hiding this comment.
While these changes look sound, they are tricky to get right. And even trickier to protect against regressions. Would you mind adding test cases in services/mailer/mailer_test.go to reproduce the problem described in #18560? Those tests would also verify the proposed fix is solid.
…type-to-message-id-for-emails
Signed-off-by: Andrew Thornton <[email protected]>
|
@singuliere done |
singuliere
approved these changes
Feb 3, 2022
GiteaBot
added
lgtm/done
Codecov Report
@@ Coverage Diff @@
## main #18566 +/- ##
=======================================
Coverage ? 46.35%
=======================================
Files ? 846
Lines ? 121169
Branches ? 0
=======================================
Hits ? 56164
Misses ? 58192
Partials ? 6813
Continue to review full report at Codecov.
|
zeripath
deleted the
fix-18560-add-action-type-to-message-id-for-emails
branch
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Feb 3, 2022
…o-gitea#18566) Backport go-gitea#18566 Gitea will currrently resend the same message-id for the closed/merged/reopened messages for issues. This will cause the merged message to leap to the top of an email chain and become out of sync. This PR adds specific suffices for these actions. Fix go-gitea#18560 Signed-off-by: Andrew Thornton <[email protected]>
zeripath
added a commit
that referenced
this pull request
Feb 4, 2022
…18566) (#18588) Backport #18566 Gitea will currrently resend the same message-id for the closed/merged/reopened messages for issues. This will cause the merged message to leap to the top of an email chain and become out of sync. This PR adds specific suffices for these actions. Fix #18560 Signed-off-by: Andrew Thornton <[email protected]>
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Feb 5, 2022
* giteaofficial/main: Use `CryptoRandomBytes` instead of `CryptoRandomString` (go-gitea#18439) Remove the spurious space in the .ui.right additional selector (go-gitea#18605) Ensure commit-statuses box is sized correctly in headers (go-gitea#18538) [skip ci] Updated translations via Crowdin Prevent merge messages from being sorted to the top of email chains (go-gitea#18566) Fix pushing to 1-x-dev docker tag (go-gitea#18578) Replace `sync.Map` with normal maps (go-gitea#18584) Fix oauth docs usage for 2fa (go-gitea#18581) Update .gitattributes for .tmpl files (go-gitea#18576) Prevent panic on prohibited user login with oauth2 (go-gitea#18562) Fix manifest.tmpl (go-gitea#18573) Make docker gitea/gitea:v1.16-dev etc refer to the latest build on that branch (go-gitea#18551) Add dropdown icon to template loading dropdown (go-gitea#18564)
Chianina
pushed a commit
to Chianina/gitea
that referenced
this pull request
Mar 28, 2022
…o-gitea#18566) * Prevent merge messages from being sorted to the top of email chains Gitea will currrently resend the same message-id for the closed/merged/reopened messages for issues. This will cause the merged message to leap to the top of an email chain and become out of sync. This PR adds specific suffices for these actions. Fix go-gitea#18560 Signed-off-by: Andrew Thornton <[email protected]> * add test Signed-off-by: Andrew Thornton <[email protected]>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Gitea will currrently resend the same message-id for the closed/merged/reopened
messages for issues. This will cause the merged message to leap to the top of an
email chain and become out of sync.
This PR adds specific suffices for these actions.
Fix #18560
Signed-off-by: Andrew Thornton [email protected]