[stable27] fix: handle non markdown files in conflicts #4272
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![backportbot-nextcloud[bot]](https://avatars.githubusercontent.com/in/21012?s=60&v=4){kind=small}
6 failed and 1 flaky tests on run #11700 ↗︎
Details:
|
|||||||||||||||||||||||||||||||||||||||
| Test | Artifacts | |
|---|---|---|
| Workspace > relative folder links |
Output
Screenshots
|
|
nodes/Links.spec.js • 3 failed tests
| Test | Artifacts | |
|---|---|---|
| ... > without text |
Output
Screenshots
|
|
| ... > with selected text |
Output
Screenshots
|
|
| ... > link to directory |
Output
Screenshots
|
|
attachments.spec.js • 2 failed tests
cypress/e2e/api/SyncServiceProvider.spec.js • 1 flaky test
| Test | Artifacts | |
|---|---|---|
| Sync service provider > recovers from a dropped message |
Output
Screenshots
|
|
This comment has been generated by cypress-bot as a result of this project's GitHub integration settings.
mejo-
force-pushed
the
backport/4220/stable27
branch
from
f18b8a2
to
d515820
Compare
|
Mh, Cypress failures might be related? 🤔 |
juliushaertl
force-pushed
the
backport/4220/stable27
branch
from
d515820
to
0fed695
Compare
This comment was marked as outdated.
This comment was marked as outdated.
|
Hm, not sure what goes wrong there yet, also test seem fine on stable26 and main |
mejo-
force-pushed
the
backport/4220/stable27
branch
from
0fed695
to
07599c2
Compare
juliushaertl
force-pushed
the
backport/4220/stable27
branch
from
07599c2
to
f0efbc2
Compare
mejo-
force-pushed
the
backport/4220/stable27
branch
from
f0efbc2
to
ee739bb
Compare
mejo-
force-pushed
the
backport/4220/stable27
branch
from
ee739bb
to
c0f9225
Compare
mejo-
force-pushed
the
backport/4220/stable27
branch
from
c0f9225
to
89997d8
Compare
blizzz
force-pushed
the
backport/4220/stable27
branch
from
89997d8
to
78e1c69
Compare
|
I think cypress is running with compiled assets. |
|
moving to 27.1.0 |
2 tasks
|
➡️ For beta 2 |
7 tasks
|
Please merge or update milestone to |
Do not parse non markdown files when resetting the content. Fixes #4205. Signed-off-by: Max <max@nextcloud.com>
Both the `.text-editor__main` and the `#read-only-editor` are not part of the Editor component that the style is scoped for. Signed-off-by: Max <max@nextcloud.com>
Text files are rendered as code blocks. Do not apply the prosemirror style to keep the background color. Signed-off-by: Max <max@nextcloud.com>
Signed-off-by: Max <max@nextcloud.com>
max-nextcloud
force-pushed
the
backport/4220/stable27
branch
from
78e1c69
to
36b2622
Compare
|
/compile |
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
max-nextcloud
approved these changes
Aug 17, 2023
|
Same tests are failing on the main branch. They are due to changes in the file picker. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport of #4220