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] Conflict fixes #3988

Merged
merged 8 commits into from
Mar 29, 2023
Merged

[stable26] Conflict fixes #3988

merged 8 commits into from
Mar 29, 2023

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Mar 24, 2023

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

backport of #3972

@backportbot-nextcloud backportbot-nextcloud bot added 26 feedback bug Something isn't working labels Mar 24, 2023
@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 26.0.1 milestone Mar 24, 2023
@cypress
Copy link

cypress bot commented Mar 24, 2023

2 flaky tests on run #9277 ↗︎

0 142 1 0 Flakiness 2

Details:

[stable26] Conflict fixes
Project: Text Commit: 351cee204b
Status: Passed Duration: 03:32 💡
Started: Mar 29, 2023 12:10 PM Ended: Mar 29, 2023 12:14 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.

@juliusknorr juliusknorr force-pushed the backport/3972/stable26 branch from 32d4831 to a073165 Compare March 27, 2023 10:01
@juliusknorr juliusknorr marked this pull request as ready for review March 27, 2023 10:01
@juliusknorr
Copy link
Member

/compile

@mejo- mejo- force-pushed the backport/3972/stable26 branch from f37297b to d991980 Compare March 29, 2023 12:03
@mejo-
Copy link
Member

mejo- commented Mar 29, 2023

I pushed 2a2b988 from #4007 to this PR.

juliusknorr and others added 7 commits March 29, 2023 14:03
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
…solution

Signed-off-by: Julius Härtl <jus@bitgrid.net>
Fixes a regression introduced by 5a2541d.

Signed-off-by: Jonas <jonas@freesources.org>
@mejo- mejo- force-pushed the backport/3972/stable26 branch from d991980 to 5ed2a21 Compare March 29, 2023 12:04
@mejo-
Copy link
Member

mejo- commented Mar 29, 2023

/compile

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@mejo- mejo- merged commit 99f7e6a into stable26 Mar 29, 2023
@delete-merged-branch delete-merged-branch bot deleted the backport/3972/stable26 branch March 29, 2023 12:32
@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
26 feedback bug Something isn't working
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants