Skip to content

Conversation

@backportbot
Copy link

@backportbot backportbot bot commented May 8, 2024

Backport of #44752

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 enhancement 3. to review Waiting for reviews labels May 8, 2024
@backportbot backportbot bot added this to the Nextcloud 27.1.10 milestone May 8, 2024
@kesselb kesselb force-pushed the backport/44752/stable27 branch from 4d8cc92 to 5d78d75 Compare May 8, 2024 09:15
case AddressBook::class:
$type = 'Addressbook';
break;
case Calendar::class:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The mapping for Calendar was added by https://github.com/nextcloud/server/pull/43117/files#diff-8df254811855b970fe5bc8f1cd91076b1b5e395a2a63d1af7c835274953d2ed8R62-R64 which was not backported to 28 and therefore caused the different diff. Backported the needed changes for the integration test (Node => Calendar) as well to make the test suite pass.

@kesselb kesselb marked this pull request as ready for review May 8, 2024 09:16
@kesselb kesselb requested a review from tcitworld as a code owner May 8, 2024 09:16
This was referenced May 15, 2024
@kesselb kesselb force-pushed the backport/44752/stable27 branch from 5d78d75 to b37b966 Compare May 24, 2024 14:37
@kesselb kesselb added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels May 24, 2024
@Altahrim Altahrim mentioned this pull request May 29, 2024
1 task
@kesselb kesselb force-pushed the backport/44752/stable27 branch from b37b966 to c24423d Compare May 29, 2024 14:42
@kesselb kesselb force-pushed the backport/44752/stable27 branch from c24423d to 9bcff76 Compare May 31, 2024 15:56
@kesselb kesselb merged commit 50b65a3 into stable27 Jun 2, 2024
@kesselb kesselb deleted the backport/44752/stable27 branch June 2, 2024 20:04
@blizzz blizzz mentioned this pull request Jun 11, 2024
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to release Ready to be released and/or waiting for tests to finish enhancement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants