Uh oh!
There was an error while loading. Please reload this page.
[stable27] fix: handle non markdown files in conflicts - #4272
Merged
Conversation
6 failed and 1 flaky tests on run #11700 ↗︎
Details:
| |||||||||||||||||||||||||||||||||||||||
| Test | Artifacts | |
|---|---|---|
| Workspace > relative folder links | OutputScreenshots | |
nodes/Links.spec.js • 3 failed tests
| Test | Artifacts | |
|---|---|---|
| ... > without text | OutputScreenshots | |
| ... > with selected text | OutputScreenshots | |
| ... > link to directory | OutputScreenshots | |
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 | OutputScreenshots | |
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
June 19, 2023 14:27
f18b8a2 to
d515820Comparemejo-
commented
Jun 19, 2023
Member
Mh, Cypress failures might be related? 🤔 |
juliusknorrforce-pushed
the
backport/4220/stable27
branch
from
June 19, 2023 19:26
d515820 to
0fed695Compare
This comment was marked as outdated.
This comment was marked as outdated.
juliusknorr
commented
Jun 19, 2023
Member
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
June 20, 2023 20:04
0fed695 to
07599c2Comparejuliusknorrforce-pushed
the
backport/4220/stable27
branch
from
June 22, 2023 21:16
07599c2 to
f0efbc2Comparemejo-force-pushed
the
backport/4220/stable27
branch
from
June 27, 2023 06:13
f0efbc2 to
ee739bbComparemejo-force-pushed
the
backport/4220/stable27
branch
from
July 7, 2023 10:39
ee739bb to
c0f9225Comparemejo-force-pushed
the
backport/4220/stable27
branch
from
July 21, 2023 09:20
c0f9225 to
89997d8Compareblizzzforce-pushed
the
backport/4220/stable27
branch
from
August 2, 2023 19:03
89997d8 to
78e1c69Compareblizzz
commented
Aug 2, 2023
Member
I think cypress is running with compiled assets. |
blizzz
commented
Aug 3, 2023
Member
moving to 27.1.0 |
2 tasks
skjnldsv
commented
Aug 11, 2023
Member
➡️ For beta 2 |
7 tasks
skjnldsv
commented
Aug 16, 2023
Member
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-nextcloudforce-pushed
the
backport/4220/stable27
branch
from
August 17, 2023 06:51
78e1c69 to
36b2622Comparemax-nextcloud
commented
Aug 17, 2023
Collaborator
/compile |
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
max-nextcloud
approved these changes
Aug 17, 2023
max-nextcloud
commented
Aug 17, 2023
Collaborator
Same tests are failing on the main branch. They are due to changes in the file picker. |
This file contains hidden or 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
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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