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

[stable26] fix: Properly emit ready event on conflicts with the editor API #4040

Merged
merged 3 commits into from
Apr 12, 2023

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Apr 12, 2023

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

backport of #4028

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@backportbot-nextcloud backportbot-nextcloud bot added the bug Something isn't working label Apr 12, 2023
@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 26.0.1 milestone Apr 12, 2023
@mejo-
Copy link
Member

mejo- commented Apr 12, 2023

/compile amend

@mejo- mejo- marked this pull request as ready for review April 12, 2023 15:28
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@cypress
Copy link

cypress bot commented Apr 12, 2023

2 flaky tests on run #9397 ↗︎

0 142 1 0 Flakiness 2

Details:

[stable26] fix: Properly emit ready event on conflicts with the editor API
Project: Text Commit: 4efbf60ede
Status: Passed Duration: 03:55 💡
Started: Apr 12, 2023 5:16 PM Ended: Apr 12, 2023 5:20 PM
Flakiness  sync.spec.js • 1 flaky test

View Output Video

Test Artifacts
Sync > recovers from a lost connection Output Screenshots
Flakiness  share.spec.js • 1 flaky test

View Output Video

Test Artifacts
Open test.md in viewer > Share a file with download disabled shows an error Output Screenshots

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

@mejo- mejo- merged commit df029aa into stable26 Apr 12, 2023
@delete-merged-branch delete-merged-branch bot deleted the backport/4028/stable26 branch April 12, 2023 17:26
@skjnldsv skjnldsv mentioned this pull request Apr 13, 2023
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants