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

WIP: fix: webfinger before loading search results for /explore/users/ #10

Draft
realaravinth wants to merge 11 commits from task-600 into forgejo
pull from: task-600
merge into: realaravinth:forgejo
Conversation 0 Commits 11 Files changed 11 +756 -33
realaravinth commented 2024-03-29 14:12:11 +05:30
Owner
Copy link
<!-- Before submitting a PR, please read the contributing guidelines: https://codeberg.org/forgejo/forgejo/src/branch/forgejo/CONTRIBUTING.md -->
realaravinth added 11 commits 2024-03-29 14:12:12 +05:30 
Creating federated hosts bypasses the normal creation rules. This
function ignores special characters check.
This pull request has changes conflicting with the target branch.
  • models/forgejo_migrations/migrate.go
  • models/forgejo_migrations/v1_22/v7.go
  • models/forgejo_migrations/v1_22/v8.go
  • 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 task-600:task-600
git checkout task-600

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 task-600
git checkout task-600
git rebase forgejo
git checkout forgejo
git merge --ff-only task-600
git checkout task-600
git rebase forgejo
git checkout forgejo
git merge --no-ff task-600
git checkout forgejo
git merge --squash task-600
git checkout forgejo
git merge --ff-only task-600
git checkout forgejo
git merge task-600
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#10
No description provided.
Delete branch "task-600"

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?