Skip to content

Conversation

@backportbot
Copy link

@backportbot backportbot bot commented Sep 2, 2025

Backport of #2956

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 requested review from artonge and susnux September 2, 2025 12:24
@backportbot backportbot bot added bug Something isn't working 3. to review Waiting for reviews labels Sep 2, 2025
@backportbot backportbot bot added this to the Nextcloud 31.0.9 milestone Sep 2, 2025
@susnux susnux force-pushed the backport/2956/stable31 branch from 2149ff2 to 5338413 Compare September 2, 2025 17:15
@susnux
Copy link
Contributor

susnux commented Sep 2, 2025

/compile

@susnux susnux marked this pull request as ready for review September 2, 2025 17:15
@susnux
Copy link
Contributor

susnux commented Sep 2, 2025

/backport 5338413 to stable30

@backportbot backportbot bot added the backport-request Pending backport by the backport-bot label Sep 2, 2025
@susnux
Copy link
Contributor

susnux commented Sep 2, 2025

/compile rebase

@susnux susnux force-pushed the backport/2956/stable31 branch from 3250f2a to 5338413 Compare September 2, 2025 18:05
@susnux
Copy link
Contributor

susnux commented Sep 2, 2025

/compile

Prevents issues where fonts are offered that the user has not installed.

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@susnux susnux force-pushed the backport/2956/stable31 branch from 0d1644c to ab5a61c Compare September 2, 2025 18:13
@susnux
Copy link
Contributor

susnux commented Sep 2, 2025

/compile

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@susnux susnux merged commit 3589fa1 into stable31 Sep 2, 2025
39 of 41 checks passed
@susnux susnux deleted the backport/2956/stable31 branch September 2, 2025 19:01
@backportbot
Copy link
Author

backportbot bot commented Sep 2, 2025

The backport to stable30 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable30
git pull origin stable30

# Create the new backport branch
git checkout -b backport/2957/stable30

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 5338413a

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/2957/stable30

Error: Failed to check for changes with origin/stable30: No changes found in backport branch


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

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 backport-request Pending backport by the backport-bot bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants