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

Use absolute icon url (fix #280) #281

Merged
merged 2 commits into from
Dec 1, 2024
Merged

Use absolute icon url (fix #280) #281

merged 2 commits into from
Dec 1, 2024

Conversation

R0Wi
Copy link
Contributor

@R0Wi R0Wi commented Dec 1, 2024

nextcloud/server@8745254 introduced new logging. This has also been discussed in nextcloud/server#47985.

@R0Wi R0Wi linked an issue Dec 1, 2024 that may be closed by this pull request
@R0Wi R0Wi force-pushed the fix#280-nc-30 branch 2 times, most recently from 9b2dc09 to d06438f Compare December 1, 2024 15:29
@R0Wi R0Wi merged commit b6cd213 into stable30 Dec 1, 2024
14 checks passed
@R0Wi R0Wi deleted the fix#280-nc-30 branch December 1, 2024 15:32
@R0Wi
Copy link
Contributor Author

R0Wi commented Dec 1, 2024

The backport to master failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-master master
# Navigate to the new working tree
cd .worktrees/backport-master
# Create a new branch
git switch --create backport-281-to-master
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick ---mainline 1 b6cd21397a0ac237782483b4c030695425e3438c
# Push it to GitHub
git push --set-upstream origin backport-281-to-master
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-master

Then, create a pull request where the base branch is master and the compare/head branch is backport-281-to-master.

@R0Wi R0Wi mentioned this pull request Dec 1, 2024
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.

Warning about icon of notification at NC 30.0.2
1 participant