10000 fix: Broken IMAP account disabling logic (backport #24118) by mergify[bot] · Pull Request #24130 · frappe/frappe · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: Broken IMAP account disabling logic (backport #24118) #24130

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 5 commits into from
Jan 4, 2024

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented Jan 4, 2024

This is an automatic backport of pull request #24118 done by Mergify.
Cherry-pick of 71908f1 has failed:

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

You are currently cherry-picking commit 71908f1e00.
  (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/doctype/email_account/email_account.py

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

Cherry-pick of cc2bb85 has failed:

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

You are currently cherry-picking commit cc2bb85484.
  (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_account/email_account.py

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

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

ankush added 4 commits January 4, 2024 13:27
redis set/get don't consider site

(cherry picked from commit 71908f1)

# Conflicts:
#	frappe/email/doctype/email_account/email_account.py
This doesn't work because when email is broken we still continue and
down the line changes get rolled back.

(cherry picked from commit 3836d94)
assign_to expects a list of strings of users not a single string.

(cherry picked from commit cc2bb85)

# Conflicts:
#	frappe/tests/test_email.py
@mergify mergify bot requested a review from a team January 4, 2024 13:27
@mergify mergify bot added the conflicts label Jan 4, 2024
@mergify mergify bot requested review from ankush and removed request for a team January 4, 2024 13:27
@mergify mergify bot assigned ankush Jan 4, 2024
@ankush ankush merged commit fbd0404 into version-14-hotfix Jan 4, 2024
@ankush ankush deleted the mergify/bp/version-14-hotfix/pr-24118 branch January 4, 2024 13:55
frappe-pr-bot pushed a commit that referenced this pull request Jan 10, 2024
## [14.62.2](v14.62.1...v14.62.2) (2024-01-10)

### Bug Fixes

* Allowed standard fields in data export ( creation, owner) (backport [#24187](#24187)) ([#24190](#24190)) ([73a0f20](73a0f20))
* ambiguous linked tables ([#24214](#24214)) ([4c5dab7](4c5dab7))
* broken `dynamic_link` to `link` formatting in query report (backport [#24054](#24054)) ([#24087](#24087)) ([ea78f39](ea78f39))
* Broken IMAP account disabling logic (backport [#24118](#24118)) ([#24130](#24130)) ([fbd0404](fbd0404))
* **communication:** don't change email case ([51562b4](51562b4))
* copy content on reply ([399ab3f](399ab3f))
* extract the frappe version from backup header directly ([ee9f28f](ee9f28f))
* number card only gives integer ([#24047](#24047)) ([#24137](#24137)) ([3ebd3a6](3ebd3a6))
* **OTP:** Autofocus OTP input, fix placeholder ([#24203](#24203)) ([#24204](#24204)) ([4d59a87](4d59a87))
* **recorder:** Normalize `IN` in SQL queries ([#24132](#24132)) ([#24133](#24133)) ([a8da916](a8da916))
* use correct parent field in rebuild_tree() ([#24107](#24107)) ([#24120](#24120)) ([5d8a825](5d8a825))
* **Web Form:** make button label translatable ([#24122](#24122)) ([1da33fd](1da33fd))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.62.2 🎉

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 26, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants
0