realaravinth/forgejo-federation
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity

WIP: fix: respond with JSON Resource Descriptor Content-Type per RFC7033 #2

Draft
realaravinth wants to merge 2 commits from tasks-598 into forgejo
pull from: tasks-598
merge into: realaravinth:forgejo
Conversation 0 Commits 2 Files changed 2 +27
realaravinth commented 2024-03-24 18:10:39 +05:30
Owner
Copy link

second

second
realaravinth added 2 commits 2024-03-24 18:10:40 +05:30
This pull request has changes conflicting with the target branch.
  • routers/web/webfinger.go
  • tests/integration/webfinger_test.go
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin tasks-598:tasks-598
git checkout tasks-598

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 forgejo
git merge --no-ff tasks-598
git checkout tasks-598
git rebase forgejo
git checkout forgejo
git merge --ff-only tasks-598
git checkout tasks-598
git rebase forgejo
git checkout forgejo
git merge --no-ff tasks-598
git checkout forgejo
git merge --squash tasks-598
git checkout forgejo
git merge --ff-only tasks-598
git checkout forgejo
git merge tasks-598
git push origin forgejo
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: realaravinth/forgejo-federation#2
No description provided.
Delete branch "tasks-598"

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?