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

[stable30] fix: promote re-shares when deleting the parent share #49629

Merged
merged 10 commits into from
Dec 19, 2024

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Dec 3, 2024

Backport of #47425

Warning, This backport's changes differ from the original and might be 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.

@backportbot backportbot bot added the 3. to review Waiting for reviews label Dec 3, 2024
@backportbot backportbot bot added this to the Nextcloud 30.0.3 milestone Dec 3, 2024
Note: Removed part about fix command from original PR

Signed-off-by: Luka Trovic <luka@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
(cherry picked from commit 42181c2)
@come-nc come-nc force-pushed the backport/47425/stable30 branch from d5f2bbd to 024f98a Compare December 19, 2024 13:40
come-nc and others added 9 commits December 19, 2024 14:41
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Canceling the previous add of deletion of invalid shares in
 transferownership because in some cases it deletes valid reshares, if
 incoming shares are not transfered on purpose.
Inverting the order of transfer between incoming and outgoing so that
 reshare can be migrated when incoming shares are transfered.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Co-authored-by: Ferdinand Thiessen <opensource@fthiessen.de>
Signed-off-by: Côme Chilliet <91878298+come-nc@users.noreply.github.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
… but promoted

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc come-nc marked this pull request as ready for review December 19, 2024 13:45
@luka-nextcloud luka-nextcloud merged commit 6626ba4 into stable30 Dec 19, 2024
174 checks passed
@luka-nextcloud luka-nextcloud deleted the backport/47425/stable30 branch December 19, 2024 14:13
@come-nc
Copy link
Contributor

come-nc commented Dec 19, 2024

/backport to stable29

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants