8000 fix(socketio): Event list_update > doctype_subscribe (backport #19422) by mergify[bot] · Pull Request #19432 · frappe/frappe · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix(socketio): Event list_update > doctype_subscribe (backport #19422) #19432

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 2 commits into from
Dec 29, 2022
Merged

fix(socketio): Event list_update > doctype_subscribe (backport #19422) #19432

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-14-hotfix/pr-19422
Your branch is up to date with 'origin/version-14-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