Today’s rebasing took ~20 minutes (40 new commits)
Conflicts because of
- https://github.com/go-gitea/gitea/pull/20869 (just ignore the changes is fine)
- https://github.com/go-gitea/gitea/pull/20262 (s/models/repo_model/)
$ git describe gitea/main
v1.18.0-dev-347-g532c223c4
$ git log --oneline --no-merges gitea/main..origin/main
73c74e91f (HEAD -> main, origin/main, origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
89a3c77bb repo: add a .projectbase repository to each project
e8eb184e1 repository: cloneLink(suffix) instead of cloneLink(isWiki)
1e8a247d5 (origin/feature-f3, origin/base-f3, feature-f3, base-f3) gofff: replace Gitea migration
380c8933b gofff: get module
c5b02b682 gofff: lfs not implemented yet
900112e75 gofff: remove the Gitea migration implementation
a3bc8988a (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
db656b324 (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
c96c192d0 CI: unit tests for models race with each other and sometime fail
5ff1b0176 CI: setup GitLab CI
9a5bc2e91 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+