ilot/wikijs: upgrade to 2.5.311 #287

Open
ayakael wants to merge 1 commit from wikijs/upgrade-2.5.311 into v3.22
Owner
No description provided.
ilot/wikijs: upgrade to 2.5.311
All checks were successful
/ lint (pull_request) Successful in 27s
/ build-x86_64 (pull_request) Successful in 6m53s
/ deploy-x86_64 (pull_request) Successful in 29s
/ build-aarch64 (pull_request) Successful in 10m24s
/ deploy-aarch64 (pull_request) Successful in 30s
0c6296ab7b
All checks were successful
/ lint (pull_request) Successful in 27s
/ build-x86_64 (pull_request) Successful in 6m53s
/ deploy-x86_64 (pull_request) Successful in 29s
/ build-aarch64 (pull_request) Successful in 10m24s
/ deploy-aarch64 (pull_request) Successful in 30s
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin wikijs/upgrade-2.5.311:wikijs/upgrade-2.5.311
git switch wikijs/upgrade-2.5.311

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch v3.22
git merge --no-ff wikijs/upgrade-2.5.311
git switch wikijs/upgrade-2.5.311
git rebase v3.22
git switch v3.22
git merge --ff-only wikijs/upgrade-2.5.311
git switch wikijs/upgrade-2.5.311
git rebase v3.22
git switch v3.22
git merge --no-ff wikijs/upgrade-2.5.311
git switch v3.22
git merge --squash wikijs/upgrade-2.5.311
git switch v3.22
git merge --ff-only wikijs/upgrade-2.5.311
git switch v3.22
git merge wikijs/upgrade-2.5.311
git push origin v3.22
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
ilot/iports!287
No description provided.