8000 fix(email_queue): allow sending emails when queue is disabled (backport #32235) by mergify[bot] · Pull Request #32237 · frappe/frappe · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix(email_queue): allow sending emails when queue is disabled (backport #32235) #32237

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 4 commits into from
Apr 22, 2025
Merged

fix(email_queue): allow sending emails when queue is disabled (backport #32235) #32237

merged 4 commits into from
Apr 22, 2025

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Apr 22, 2025
  • Allow to manually send an email even if queue is disabled
  • fix(email_queue): remove confirm step
This is an automatic backport of pull request #32235 done by [Mergify](https://mergify.com).

nliechti and others added 2 commits April 22, 2025 08:10
@nliechti @mergify
fix: Allow to manually send an email even if queue is disabled
13054b8 
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
(cherry picked from commit 4848fbd)

# Conflicts:
#	frappe/email/doctype/email_queue/email_queue.py
@akhilnarang @mergify
fix(email_queue): remove confirm step
4b73218 
No point having 2 steps, if the user has ended up here they do want to send the email.

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
(cherry picked from commit 8181354)

# Conflicts:
#	frappe/email/doctype/email_queue/email_queue.py
@mergify mergify bot added the conflicts label Apr 22, 2025
@mergify Mergify
Copy link
Contributor Author
mergify bot commented Apr 22, 2025

Cherry-pick of 4848fbd has failed:

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

You are currently cherry-picking commit 4848fbda0b.
  (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)

Changes to be committed:
	modified:   frappe/email/doctype/email_queue/email_queue.js

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

Cherry-pick of 8181354 has failed:

On branch mergify/bp/version-15-hotfix/pr-32235
Your branch is ahead of 'origin/version-15-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 81813548e9.
  (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)

Changes to be committed:
	modified:   frappe/email/doctype/email_queue/email_queue.js

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

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

@akhilnarang akhilnarang merged commit 20b9c60 into version-15-hotfix Apr 22, 2025
16 of 17 checks passed
@akhilnarang akhilnarang deleted the mergify/bp/version-15-hotfix/pr-32235 branch April 22, 2025 10:22
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.66.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 7, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@akhilnarang akhilnarang

Labels
conflicts released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@frappe-pr-bot @akhilnarang @nliechti
0