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(socketio): Event list_update > doctype_subscribe (backport #19422) #19431

Merged
merged 2 commits into from Dec 29, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 29, 2022

This is an automatic backport of pull request #19422 done by Mergify.
Cherry-pick of c960382 has failed:

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

You are currently cherry-picking commit c960382667.
  (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/public/js/frappe/list/list_view.js
	modified:   frappe/public/js/frappe/socketio_client.js
	modified:   frappe/public/js/frappe/views/reports/report_view.js
	modified:   socketio.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/realtime.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

(cherry picked from commit c960382)

# Conflicts:
#	frappe/realtime.py
@mergify mergify bot requested a review from a team as a code owner December 29, 2022 08:33
@mergify mergify bot requested review from shariquerik and removed request for a team December 29, 2022 08:33
@mergify mergify bot added the conflicts label Dec 29, 2022
frappe/realtime.py Outdated Show resolved Hide resolved
@phot0n phot0n removed the conflicts label Dec 29, 2022
@phot0n phot0n merged commit 1a2a1cc into version-13-hotfix Dec 29, 2022
@phot0n phot0n deleted the mergify/bp/version-13-hotfix/pr-19422 branch December 29, 2022 12:08
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.

None yet

3 participants