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: prevent emails from being queued multiple times (backport #19386) #19454

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.


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

* 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)
@mergify mergify bot requested a review from a team as a code owner January 2, 2023 08:07
@mergify mergify bot requested review from phot0n and removed request for a team January 2, 2023 08:07
@ankush ankush merged commit 21b84a4 into version-14-hotfix Jan 2, 2023
@ankush ankush deleted the mergify/bp/version-14-hotfix/pr-19386 branch January 2, 2023 09:45
frappe-pr-bot pushed a commit that referenced this pull request Jan 4, 2023
## [14.21.1](v14.21.0...v14.21.1) (2023-01-04)

### Bug Fixes

* Allow everyone to read geo data ([#19451](#19451)) ([#19457](#19457)) ([54eecce](54eecce))
* build_response for re.Match ([#19442](#19442)) ([c3729c7](c3729c7))
* don't set default in list view for fields not allowed ([373234d](373234d))
* **link/js:** handle undefined `link_title_doctypes` in `frappe.boot` ([#19398](#19398)) ([#19402](#19402)) ([f314e58](f314e58))
* only allow system manager to create email templates ([f46a649](f46a649))
* prevent emails from being queued multiple times ([#19386](#19386)) ([#19454](#19454)) ([21b84a4](21b84a4))
* show document title instead of name in like notification email subject ([41af70d](41af70d))
* **socketio:** Event list_update > doctype_subscribe (backport [#19422](#19422)) ([#19432](#19432)) ([4529e6d](4529e6d))
* **test:** override fields of test doctype if passed ([8a86a8c](8a86a8c))
* use title instead of name in message body too ([5878b53](5878b53))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.21.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

stephenBDT added a commit to alias/frappe that referenced this pull request Jan 10, 2023
…rappe#19454)

* 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)

Co-authored-by: stephen <stephenBDT@users.noreply.github.com>
stephenBDT pushed a commit to alias/frappe that referenced this pull request Jan 10, 2023
## [14.21.1](frappe/frappe@v14.21.0...v14.21.1) (2023-01-04)

### Bug Fixes

* Allow everyone to read geo data ([frappe#19451](frappe#19451)) ([frappe#19457](frappe#19457)) ([54eecce](frappe@54eecce))
* build_response for re.Match ([frappe#19442](frappe#19442)) ([c3729c7](frappe@c3729c7))
* don't set default in list view for fields not allowed ([373234d](frappe@373234d))
* **link/js:** handle undefined `link_title_doctypes` in `frappe.boot` ([frappe#19398](frappe#19398)) ([frappe#19402](frappe#19402)) ([f314e58](frappe@f314e58))
* only allow system manager to create email templates ([f46a649](frappe@f46a649))
* prevent emails from being queued multiple times ([frappe#19386](frappe#19386)) ([frappe#19454](frappe#19454)) ([21b84a4](frappe@21b84a4))
* show document title instead of name in like notification email subject ([41af70d](frappe@41af70d))
* **socketio:** Event list_update > doctype_subscribe (backport [frappe#19422](frappe#19422)) ([frappe#19432](frappe#19432)) ([4529e6d](frappe@4529e6d))
* **test:** override fields of test doctype if passed ([8a86a8c](frappe@8a86a8c))
* use title instead of name in message body too ([5878b53](frappe@5878b53))
@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.

None yet

3 participants