mg/homeserver
1
0
Fork 0
Code Issues 1 Pull requests 3 Activity Actions

update forgejo via renovate #225

Open
mg wants to merge 5 commits from fr2 into master
pull from: fr2
merge into: mg:master
Conversation 0 Commits 5 Files changed 2 +50 -60
mg commented 2024-11-06 20:00:50 +01:00
Owner
Copy link
No description provided.
mg added 5 commits 2024-11-06 20:00:51 +01:00
fix renovate config for forgejo (#170)
All checks were successful
ansible-lint / gitleaks (push) Successful in 3s
Details
ansible-lint / Ansible Lint (push) Successful in 30s
Details
2ff10f672e 
Reviewed-on: #170
Co-authored-by: Michael Grote <michael.grote@posteo.de>
Co-committed-by: Michael Grote <michael.grote@posteo.de>
test
All checks were successful
ansible-lint / gitleaks (push) Successful in 4s
Details
ansible-lint / Ansible Lint (push) Successful in 37s
Details
38c82a7223
test
All checks were successful
ansible-lint / gitleaks (push) Successful in 4s
Details
ansible-lint / Ansible Lint (push) Successful in 40s
Details
8d00d2a33c
test
All checks were successful
ansible-lint / gitleaks (push) Successful in 4s
Details
ansible-lint / Ansible Lint (push) Successful in 52s
Details
2bafbf5fb1
test
All checks were successful
ansible-lint / gitleaks (push) Successful in 3s
Details
ansible-lint / Ansible Lint (push) Successful in 32s
Details
ansible-lint / gitleaks (pull_request) Successful in 3s
Details
ansible-lint / Ansible Lint (pull_request) Successful in 30s
Details
5b39e67e5d
All checks were successful
ansible-lint / gitleaks (push) Successful in 3s
Details
ansible-lint / Ansible Lint (push) Successful in 32s
Details
ansible-lint / gitleaks (pull_request) Successful in 3s
Details
ansible-lint / Ansible Lint (pull_request) Successful in 30s
Details
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 fr2:fr2
git checkout fr2

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 checkout master
git merge --no-ff fr2
git checkout fr2
git rebase master
git checkout master
git merge --ff-only fr2
git checkout fr2
git rebase master
git checkout master
git merge --no-ff fr2
git checkout master
git merge --squash fr2
git checkout master
git merge --ff-only fr2
git checkout master
git merge fr2
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
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: mg/homeserver#225
No description provided.
Delete branch "fr2"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?