Today’s rebasing took 10 minutes (36 new commits). There was a merge conflict because the README.md changed.
$ git describe gitea/main
v1.17.0-dev-700-gedf14202f
$ git log --oneline --no-merges gitea/main..origin/main
69a895a1e (HEAD -> main, origin/main, origin/feature-activitypub, feature-activitypub) activitypub: implement Repository
d97c8e042 activitypub: hack_16834
74ff002a4 activitypub: implement the ReqSignature middleware
e0d114cd1 activitypub: signing http client
e5363b9a8 activitypub: go-fed conformant Clock instance
3c1fcb672 activitypub: add the public key to Person (#14186)
e8fdeb68c activitypub: implement /api/v1/activitypub/user/{username} (#14186)
8555995d6 (origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
7c297b616 repo: add a .projectbase repository to each project
0e81c16a3 repository: cloneLink(suffix) instead of cloneLink(isWiki)
f63fe4dd5 (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
62357393b (origin/feature-go-fed, feature-go-fed) go.mod: add go-fed/{httpsig,activity/pub,activity/streams} dependency
07e6c651d (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
2bc900a8d CI: unit tests for models race with each other and sometime fail
5aabd20e5 CI: setup GitLab CI
dce2e04dd (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+