Skip to content

Conversation

@backportbot
Copy link

@backportbot backportbot bot commented Apr 9, 2025

Backport of #52075

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

Todo

  • Review and resolve any conflicts
  • Amend HEAD commit to remove the line stating to skip CI

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
@skjnldsv skjnldsv force-pushed the backport/52075/stable29 branch from 5c6fd77 to 066e397 Compare April 9, 2025 15:38
@skjnldsv
Copy link
Member

skjnldsv commented Apr 9, 2025

/compile

@skjnldsv skjnldsv marked this pull request as ready for review April 9, 2025 15:39
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@skjnldsv skjnldsv mentioned this pull request Apr 10, 2025
15 tasks
@skjnldsv skjnldsv merged commit f2ad50f into stable29 Apr 11, 2025
152 of 182 checks passed
@skjnldsv skjnldsv deleted the backport/52075/stable29 branch April 11, 2025 11:40
@danxuliu
Copy link
Member

@skjnldsv Please note that this introduced a failure in the PHP unit tests in stable29 (Test\Share20\ManagerTest::testPathCreateChecksContainsSharedMount).

@skjnldsv
Copy link
Member

Thanks, weird I fixed it in above branches. Might have missed my backport rebase :)

skjnldsv added a commit that referenced this pull request Apr 14, 2025
Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
skjnldsv added a commit that referenced this pull request Apr 14, 2025
Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
backportbot bot pushed a commit that referenced this pull request Apr 14, 2025
Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
skjnldsv added a commit that referenced this pull request Apr 14, 2025
fix(tests): Share manager error message from #52076
skjnldsv added a commit that referenced this pull request Apr 14, 2025
fix(tests): Share manager error message from #52076
This was referenced Apr 15, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants