fix: handle non markdown files in conflicts

[max-nextcloud]

📝 Summary

Do not parse non markdown files when resetting the content.
Also add CodeBlock extension in Reader so it renders the server version.

Fixes #4205.

🚧 TODO

• fix background of conflict view
• tests

🏁 Checklist

• Code is properly formatted (npm run lint / npm run stylelint / composer run cs:check)
• Sign-off message is added to all commits
• Tests (unit, integration and/or end-to-end) passing and the changes are covered with tests
• Documentation is not required

[cypress]

2 flaky tests on run #10097 ↗︎

0

146

1

0

2

Details:

fix: handle non markdown files in conflicts
Project: Text	Commit: ce4775fb1f
Status: Passed	Duration: 03:28 💡
Started: Jun 8, 2023 6:45 PM	Ended: Jun 8, 2023 6:49 PM

  sync.spec.js • 1 flaky test

View Output Video

Test		Artifacts
Sync > recovers from a lost connection		Output Screenshots

  nodes/HardBreak.spec.js • 1 flaky test

View Output Video

Test		Artifacts
Hard break support > Can create hard breaks with shift+enter		Output Screenshots

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

[juliusknorr]

Code looks good, trusting in cypress for testing

[max-nextcloud]

/backport to stable27

[max-nextcloud]

/backport to stable26

[max-nextcloud]

/compile

[max-nextcloud]

/compile

[mejo-]

/compile

[max-nextcloud]

compile failures look like they might be related to the path setup on the runners. However it looked like this was a default github runner - so i don't quite understand what's going on here.

[mejo-]

compile failures look like they might be related to the path setup on the runners. However it looked like this was a default github runner - so i don't quite understand what's going on here.

Yeah. To be honest for me the workaround is to just restart them until the job is picked up by a not self-hosted runner 🙈

[mejo-]

But the cypress failures look related to the PR, no? https://github.com/nextcloud/text/actions/runs/5214578471/jobs/9411036184?pr=4220#step:7:129

[backportbot-nextcloud]

The backport to stable27 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable27
git pull origin stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

[backportbot-nextcloud]

The backport to stable26 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable26
git pull origin stable26

# Create the new backport branch
git checkout -b fix/foo-stable26

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

[mejo-]

/backport cc601a7,8f5ca56d6beb2234746724e54d9c133b66736293,6a330e4a0c91b0274f53da2dac2d4825a9af1834,36f21e6ee2e2c338cb4e1a97218e16752f72954c to stable27

[mejo-]

/backport cc601a7,8f5ca56d6beb2234746724e54d9c133b66736293,6a330e4a0c91b0274f53da2dac2d4825a9af1834,36f21e6ee2e2c338cb4e1a97218e16752f72954c to stable26