Skip to content

[stable26] fix(editor): Don't load both Tiptap collaboration history extensions - #4623

Merged
mejo- merged 2 commits into
stable26from
backport/4621/stable26
Aug 2, 2023
Merged

[stable26] fix(editor): Don't load both Tiptap collaboration history extensions#4623
mejo- merged 2 commits into
stable26from
backport/4621/stable26

Conversation

@backportbot-nextcloud

Copy link
Copy Markdown

Backport of #4621

Instead of loading Tiptap `extension-history` in RichText.js, let's load
it only in `MarkdownContentEditor.vue`.
* Editor.vue loads `extension-collaboration`
* MarkdownContentEditor.vue loads `extension-history`
Fixes: #4601
Signed-off-by: Jonas <jonas@freesources.org>
@mejo-

mejo- commented Aug 2, 2023

Copy link
Copy Markdown
Member

/compile

@cypress

cypressBot commented Aug 2, 2023

Copy link
Copy Markdown

2 flaky tests on run #11473 ↗︎

014820Flakiness2

Details:

[stable26] fix(editor): Don't load both Tiptap collaboration history extensions
Project: TextCommit:ec3311e382
Status: PassedDuration: 04:25 💡
Started: Aug 2, 2023 3:30 PMEnded: Aug 2, 2023 3:35 PM
Flakiness share.spec.js • 1 flaky test

ViewOutputVideo

Test Artifacts
Open test.md in viewer > Share a file with download disabled shows an error OutputScreenshots
Flakiness api/SyncServiceProvider.spec.js • 1 flaky test

ViewOutputVideo

Test Artifacts
Sync service provider > recovers from a dropped message OutputScreenshots

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

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@mejo-
mejo- merged commit ba5798e into stable26Aug 2, 2023
@mejo-
mejo- deleted the backport/4621/stable26 branch August 2, 2023 15:59
@blizzzblizzz mentioned this pull request Aug 2, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@mejo-@nextcloud-command