8000 fix: prevent emails from being queued multiple times (backport #19386) by mergify[bot] · Pull Request #19453 · frappe/frappe · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: prevent emails from being queued multiple times (backport #19386) #19453

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

Merged
merged 1 commit into from
Jan 2, 2023

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Jan 2, 2023

This is an automatic backport of pull request #19386 done by Mergify.
Cherry-pick of 6b0950e has failed:

On branch mergify/bp/version-13-hotfix/pr-19386
Your branch is up to date with 'origin/version-13-hotfix'.

You are currently cherry-picking commit 6b0950e1d2.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/email/queue.py

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot requested review from a team and shariquerik and removed request for a team January 2, 2023 08:07
@mergify mergify bot added the conflicts label Jan 2, 2023
* fix: prevent emails from being queued multiple times

* style: fmt

* refactor: optimistic error handling

- Combined email queue sending to single call instead of different
  branches for testing.
- If failing to get jobs -> attempt sending anyway. Failure could be
  form one bad job which shouldn't completely stop everything.

* chore: type

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit 6b0950e)
@ankush ankush force-pushed the mergify/bp/version-13-hotfix/pr-19386 branch from 2f3995b to f59ab43 Compare January 2, 2023 10:00
@ankush ankush removed the conflicts label Jan 2, 2023
@ankush ankush merged commit 4b1ad20 into version-13-hotfix Jan 2, 2023
@ankush ankush deleted the mergify/bp/version-13-hotfix/pr-19386 branch January 2, 2023 11:58
frappe-pr-bot pushed a commit that referenced this pull request Jan 4, 2023
## [13.46.3](v13.46.2...v13.46.3) (2023-01-04)

### Bug Fixes

* only allow system manager to create/edit email templates by default (backport [#19458](#19458)) ([4dedbd8](4dedbd8))
* prevent emails from being queued multiple times ([#19386](#19386)) ([#19453](#19453)) ([4b1ad20](4b1ad20))
* **socketio:** Event list_update > doctype_subscribe (backport [#19422](#19422)) ([#19431](#19431)) ([1a2a1cc](1a2a1cc))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.46.3 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 19, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants
0