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.

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

[stable26] fix: Only handle recent awareness messagess from sessions #4062

Merged
merged 2 commits into from
Apr 25, 2023
Merged

[stable26] fix: Only handle recent awareness messagess from sessions #4062

merged 2 commits into from
Apr 25, 2023

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Apr 17, 2023 •
edited by max-nextcloud
Loading

  • ⚠️ This backport had conflicts that were resolved with the 'ours' merge strategy and is likely incomplete

backport of #4053

@backportbot-nextcloud backportbot-nextcloud bot added the bug Something isn't working label Apr 17, 2023
@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 26.0.1 milestone Apr 17, 2023
@cypress
Copy link

cypress bot commented Apr 17, 2023 •
edited
Loading

Passing run #9499 ↗︎

0 142 1 0 Flakiness 0

Details:

[stable26] fix: Only handle recent awareness messagess from sessions
Project: Text Commit: c9cd100697
Status: Passed Duration: 04:21 💡
Started: Apr 25, 2023 8:14 AM Ended: Apr 25, 2023 8:19 AM

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings.

@skjnldsv skjnldsv mentioned this pull request Apr 18, 2023
Merged
9 tasks
@juliusknorr @max-nextcloud
fix: Only handle recent awareness messagess from sessions
ec22a88 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@max-nextcloud max-nextcloud force-pushed the backport/4053/stable26 branch from 76af3ef to 5e1c7fe Compare April 25, 2023 07:45
@max-nextcloud
Copy link
Collaborator

/compile amend /

@nextcloud-command
Compile assets
c9cd100 
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
max-nextcloud
max-nextcloud approved these changes Apr 25, 2023
View reviewed changes
Copy link
Collaborator

@max-nextcloud max-nextcloud left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Backport was incomplete with respect to build artifacts. Once the compile command finished this should be fine.

@max-nextcloud max-nextcloud marked this pull request as ready for review April 25, 2023 07:50
@max-nextcloud max-nextcloud merged commit 19d5580 into stable26 Apr 25, 2023
@delete-merged-branch delete-merged-branch bot deleted the backport/4053/stable26 branch April 25, 2023 09:18
@blizzz blizzz mentioned this pull request May 16, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@max-nextcloud max-nextcloud max-nextcloud approved these changes

@juliusknorr juliusknorr Awaiting requested review from juliusknorr

Assignees
No one assigned
Labels
bug Something isn't working
Projects
None yet
Milestone
Nextcloud 26.0.2
Development

Successfully merging this pull request may close these issues.
4 participants
@max-nextcloud @skjnldsv @juliusknorr @nextcloud-command