Recurring forgefriends sync / rebase on Gitea

Today’s rebasing took 30 minutes, no conflicts. A test fixture changed and projectbase needed fixing.

$ git describe gitea/main
v1.17.0-dev-159-ga39287cd4
$ git log --oneline --no-merges gitea/main..origin/main
ccdc9429b (HEAD -> main, origin/main, origin/feature-activitypub, feature-activitypub) activitypub: implement Repository
0076e9b3a activitypub: hack_16834
8eadf15c4 activitypub: implement the ReqSignature middleware
137f0b7e9 activitypub: signing http client
1c81b127f activitypub: go-fed conformant Clock instance
bf1ec9ace activitypub: add the public key to Person (#14186)
9c6541b41 activitypub: implement /api/v1/activitypub/user/{username} (#14186)
b25f8a133 (origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
fff6332a1 repo: add a .projectbase repository to each project
f3061b683 repository: cloneLink(suffix) instead of cloneLink(isWiki)
28203f10b (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
adb8d9b4e CI: unit tests for models race with each other and sometime fail
f3a48411a CI: setup GitLab CI
4f455c26d (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
7e6b375a3 (origin/feature-go-fed, feature-go-fed) go.mod: add go-fed/{httpsig,activity/pub,activity/streams} dependency (#14186)
33559fecb (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

Today’s rebasing took 5 minutes.

$ git describe gitea/main
v1.17.0-dev-165-g08fe6f8c7
$ git log --oneline --no-merges gitea/main..origin/main
16547f5c2 (HEAD -> main, origin/main, origin/feature-activitypub, feature-activitypub) activitypub: implement Repository
688f58bd8 activitypub: hack_16834
f5d86dd04 activitypub: implement the ReqSignature middleware
1f41dfdc8 activitypub: signing http client
1f0fb91ed activitypub: go-fed conformant Clock instance
ded3f267c activitypub: add the public key to Person (#14186)
a9b2e2c6c activitypub: implement /api/v1/activitypub/user/{username} (#14186)
26cc3308e (origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
1669d656d repo: add a .projectbase repository to each project
9750aead3 repository: cloneLink(suffix) instead of cloneLink(isWiki)
175375499 (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
2129718f8 CI: unit tests for models race with each other and sometime fail
66a302c11 CI: setup GitLab CI
2b36560a7 (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
48d196a81 (origin/feature-go-fed, feature-go-fed) go.mod: add go-fed/{httpsig,activity/pub,activity/streams} dependency (#14186)
bd724192e (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

Today’s rebasing took 5 minutes.

$ git describe gitea/main
v1.17.0-dev-184-g159c3f48a
$ git log --oneline --no-merges gitea/main..origin/main
48b616835 (origin/main, main) activitypub: implement Repository
a62fa83a0 activitypub: hack_16834
a4082ce65 activitypub: implement the ReqSignature middleware
05c6d4da4 activitypub: signing http client
8f1718052 activitypub: go-fed conformant Clock instance
22213d24c activitypub: add the public key to Person (#14186)
32b4399f7 activitypub: implement /api/v1/activitypub/user/{username} (#14186)
5e718f742 projectbase: implement tests for UpdateProjectBase
bfb0d73f6 repo: add a .projectbase repository to each project
5a6a3323e repository: cloneLink(suffix) instead of cloneLink(isWiki)
92d41bcc1 tests: do not test against the GitHub API
e98679392 CI: unit tests for models race with each other and sometime fail
80e4dfb97 CI: setup GitLab CI
2b36560a7 gitignore: emacs backups
48d196a81 go.mod: add go-fed/{httpsig,activity/pub,activity/streams} dependency (#14186)
bd724192e forgefriends is licensed under AGPLv3+

Today’s rebasing took 5 minutes.

$ git describe gitea/main
v1.17.0-dev-215-g6d55a132a
 git log --oneline --no-merges gitea/main..origin/main
c9d7d6a8e (origin/main, origin/feature-activitypub, main, feature-activitypub) activitypub: implement Repository
77638e71d activitypub: hack_16834
7f43627f4 activitypub: implement the ReqSignature middleware
b1fb4e1d1 activitypub: signing http client
1576d8f60 activitypub: go-fed conformant Clock instance
80c7b070e activitypub: add the public key to Person (#14186)
53b462596 activitypub: implement /api/v1/activitypub/user/{username} (#14186)
ea8ae36e7 (origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
f9361ee0c repo: add a .projectbase repository to each project
cd42d9cae repository: cloneLink(suffix) instead of cloneLink(isWiki)
6c687310d (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
9343d8e1f (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
9e04e1ae1 CI: unit tests for models race with each other and sometime fail
b2836b7ea CI: setup GitLab CI
1e5811c92 (origin/feature-go-fed, feature-go-fed) go.mod: add go-fed/{httpsig,activity/pub,activity/streams} dependency (#14186)
b794a1191 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

Today’s rebasing took 5 minutes.

$ git describe gitea/main
v1.17.0-dev-254-gb24e8d38a
$ git log --oneline --no-merges gitea/main..origin/main
4486aacae (origin/main, origin/feature-activitypub, main, feature-activitypub) activitypub: implement Repository
c2ce7d502 activitypub: hack_16834
792b5ec68 activitypub: implement the ReqSignature middleware
bb04ab8f9 activitypub: signing http client
cd42eaae4 activitypub: go-fed conformant Clock instance
dab9c3f14 activitypub: add the public key to Person (#14186)
92bcba858 activitypub: implement /api/v1/activitypub/user/{username} (#14186)
5155088b0 (origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
f1d66a5ec repo: add a .projectbase repository to each project
576505ead repository: cloneLink(suffix) instead of cloneLink(isWiki)
10f194dff (origin/feature-go-fed, feature-go-fed) go.mod: add go-fed/{httpsig,activity/pub,activity/streams} dependency (#14186)
feed15171 (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
6aa5cf6d8 CI: unit tests for models race with each other and sometime fail
8967cbedd CI: setup GitLab CI
5b084c6a1 (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
4d1bd364a (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

Today’s rebasing took 15 minutes. New dependencies required redoing the addition of the go-fed / httpsig commit, which was trivial.

$ git describe gitea/main
v1.17.0-dev-279-g780cf76f6
$ git log --oneline --no-merges gitea/main..origin/main
ce2075fb1 (origin/main, origin/feature-activitypub, main, feature-activitypub) activitypub: implement Repository
3e544f51c activitypub: hack_16834
d0b6f1650 activitypub: implement the ReqSignature middleware
bf06de18f activitypub: signing http client
526afb4dd activitypub: go-fed conformant Clock instance
f685f4e1d activitypub: add the public key to Person (#14186)
660da4248 activitypub: implement /api/v1/activitypub/user/{username} (#14186)
466a5d85d (origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
53bfafc8c repo: add a .projectbase repository to each project
53d09482d repository: cloneLink(suffix) instead of cloneLink(isWiki)
bbfe46b16 (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
d732ead76 (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
1a8a3574e CI: unit tests for models race with each other and sometime fail
15dbe524e CI: setup GitLab CI
a275f0ee4 (origin/feature-go-fed, feature-go-fed) go.mod: add go-fed/{httpsig,activity/pub,activity/streams} dependency
fd065c149 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

Today’s rebasing took 5 minutes.

$ git describe gitea/main
v1.17.0-dev-305-g83a2f79d5
$ git log --oneline --no-merges gitea/main..origin/main
2dd9c2da8 (HEAD -> main, origin/main, origin/feature-activitypub, feature-activitypub) activitypub: implement Repository
5a3f69489 activitypub: hack_16834
77caa0a8d activitypub: implement the ReqSignature middleware
f2877b0fb activitypub: signing http client
6314d0764 activitypub: go-fed conformant Clock instance
015fc3c84 activitypub: add the public key to Person (#14186)
065b195a2 activitypub: implement /api/v1/activitypub/user/{username} (#14186)
1200a9486 (origin/feature-go-fed, feature-go-fed) go.mod: add go-fed/{httpsig,activity/pub,activity/streams} dependency
80fe22487 (origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
82824b2aa repo: add a .projectbase repository to each project
0184a733f repository: cloneLink(suffix) instead of cloneLink(isWiki)
069de4a6f (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
95de0fb49 CI: unit tests for models race with each other and sometime fail
d8e53c016 CI: setup GitLab CI
2e960ce0d (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
b93d0a73c (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

Today’s rebasing took 5 minutes.

$ git describe gitea/main
v1.17.0-dev-335-g59b867dc2
$ git log --oneline --no-merges gitea/main..origin/main
aa5e257ae (HEAD -> main, origin/main, origin/feature-activitypub, feature-activitypub) activitypub: implement Repository
7804708a8 activitypub: hack_16834
ede66fe36 activitypub: implement the ReqSignature middleware
1c44f52b8 activitypub: signing http client
d0bdfdebe activitypub: go-fed conformant Clock instance
67d99ef4a activitypub: add the public key to Person (#14186)
203b05346 activitypub: implement /api/v1/activitypub/user/{username} (#14186)
8c2c990cc (origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
418e00add repo: add a .projectbase repository to each project
4b3a2fff1 repository: cloneLink(suffix) instead of cloneLink(isWiki)
253e1e159 (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
b54673dea (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
7a466e509 CI: unit tests for models race with each other and sometime fail
f1ae7f4be CI: setup GitLab CI
09edf8a7c (origin/feature-go-fed, feature-go-fed) go.mod: add go-fed/{httpsig,activity/pub,activity/streams} dependency
24edf1cb7 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

Today’s rebasing took 1 hour because of a refactor of:

  • repo.go that triggered contextual conflicts.
  • git that now has different arguments for Run
$ git describe gitea/main
v1.17.0-dev-395-g7b4c3c7bb
$ git log --oneline --no-merges gitea/main..origin/main
44542dde5 (HEAD -> main, origin/main, origin/feature-activitypub, feature-activitypub) activitypub: implement Repository
148f19caf activitypub: hack_16834
5baa285db activitypub: implement the ReqSignature middleware
f9a0651f1 activitypub: signing http client
2c71b2f45 activitypub: go-fed conformant Clock instance
ae6467681 activitypub: add the public key to Person (#14186)
aa4c55841 activitypub: implement /api/v1/activitypub/user/{username} (#14186)
73e1c7cdc (origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
32d272c45 repo: add a .projectbase repository to each project
a7cab80ab repository: cloneLink(suffix) instead of cloneLink(isWiki)
f9a6bb562 (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
04f4a7ae8 (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
75e021b8b CI: unit tests for models race with each other and sometime fail
328f2fad7 CI: setup GitLab CI
c66a2fff2 (origin/feature-go-fed, feature-go-fed) go.mod: add go-fed/{httpsig,activity/pub,activity/streams} dependency
5352b1cdf (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

Today’s rebasing took 5 minutes.

$ git describe gitea/main
v1.17.0-dev-416-gc003491cf
$ git log --oneline --no-merges gitea/main..origin/main
17d95e98a (HEAD -> main, origin/main, origin/feature-activitypub, feature-activitypub) activitypub: implement Repository
f2006c83e activitypub: hack_16834
d478b3f65 activitypub: implement the ReqSignature middleware
66b86c8a7 activitypub: signing http client
6e53d8db3 activitypub: go-fed conformant Clock instance
b304a7b25 activitypub: add the public key to Person (#14186)
d4bbdb151 activitypub: implement /api/v1/activitypub/user/{username} (#14186)
dfbd601e4 (origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
ce39253ec repo: add a .projectbase repository to each project
246093b6c repository: cloneLink(suffix) instead of cloneLink(isWiki)
3b989b892 (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
8ca3b0a18 (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
9750a3b5c CI: unit tests for models race with each other and sometime fail
59cf77908 CI: setup GitLab CI
44f1ff331 (origin/feature-go-fed, feature-go-fed) go.mod: add go-fed/{httpsig,activity/pub,activity/streams} dependency
04bb7a951 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+
1 Like

Today’s rebasing took 20 minutes (14 new commits).

A test failed because of the new way unittest options are passed:

func TestMain(m *testing.M) {
	unittest.MainTest(m, filepath.Join("..", ".."))
}
$ git describe gitea/main
v1.17.0-dev-430-g490065b93
$ git log --oneline --no-merges gitea/main..origin/main
d3c64e035 (HEAD -> main, origin/main, origin/feature-activitypub, feature-activitypub) activitypub: implement Repository
691d9caad activitypub: hack_16834
ec3abefc0 activitypub: implement the ReqSignature middleware
b0aebba01 activitypub: signing http client
0c95f0602 activitypub: go-fed conformant Clock instance
007f7327e activitypub: add the public key to Person (#14186)
cf9516744 activitypub: implement /api/v1/activitypub/user/{username} (#14186)
d7b1a4917 (origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
58df002b0 repo: add a .projectbase repository to each project
eaf35e537 repository: cloneLink(suffix) instead of cloneLink(isWiki)
d81472dc6 (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
b001ca007 (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
338bfa7c8 CI: unit tests for models race with each other and sometime fail
7b8903056 CI: setup GitLab CI
f03c9c94b (origin/feature-go-fed, feature-go-fed) go.mod: add go-fed/{httpsig,activity/pub,activity/streams} dependency
ffa37d2e7 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+
1 Like

Today’s rebasing took 5 minutes (27 new commits).

$ git describe gitea/main
v1.17.0-dev-457-g2ec2baf24
$ git log --oneline --no-merges gitea/main..origin/main
3fcfb4431 (HEAD -> main, origin/main, origin/feature-activitypub, feature-activitypub) activitypub: implement Repository
37fd543e1 activitypub: hack_16834
2b3a7a209 activitypub: implement the ReqSignature middleware
dd0eabd45 activitypub: signing http client
b31b65c1f activitypub: go-fed conformant Clock instance
1f6999c4e activitypub: add the public key to Person (#14186)
0fa79060f activitypub: implement /api/v1/activitypub/user/{username} (#14186)
f512deed6 (origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
296eb20a8 repo: add a .projectbase repository to each project
6e5bb4592 repository: cloneLink(suffix) instead of cloneLink(isWiki)
400721267 (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
64bdfeb0f (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
70e272d5d CI: unit tests for models race with each other and sometime fail
2ceb2a659 CI: setup GitLab CI
c73aac5e3 (origin/feature-go-fed, feature-go-fed) go.mod: add go-fed/{httpsig,activity/pub,activity/streams} dependency
4ec3e8d3c (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+
1 Like

Today’s rebasing took 5 minutes (46 new commits).

$ git describe gitea/main
v1.17.0-dev-503-g1597e2da3
$ git log --oneline --no-merges gitea/main..origin/main
bd0f94da1 (HEAD -> main, origin/main, origin/feature-activitypub, feature-activitypub) activitypub: implement Repository
ada894b89 activitypub: hack_16834
67a5e5bf2 activitypub: implement the ReqSignature middleware
2eec8f0a8 activitypub: signing http client
feaf8e78f activitypub: go-fed conformant Clock instance
9bcd197d7 activitypub: add the public key to Person (#14186)
1dba05438 activitypub: implement /api/v1/activitypub/user/{username} (#14186)
32363edde (origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
6e88b2f5a repo: add a .projectbase repository to each project
edabf4574 repository: cloneLink(suffix) instead of cloneLink(isWiki)
bec7616ed (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
4dd26ade4 (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
71747070e CI: unit tests for models race with each other and sometime fail
bd638b392 CI: setup GitLab CI
feabd8141 (origin/feature-go-fed, feature-go-fed) go.mod: add go-fed/{httpsig,activity/pub,activity/streams} dependency
ed0a85554 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+
1 Like

Today’s rebasing took 5 minutes (43 new commits). There was one minor context conflict because a federation feature was added in the settings.

$ git describe gitea/main
v1.17.0-dev-546-g5ca224a78
$ git log --oneline --no-merges gitea/main..origin/main
85783273f (HEAD -> main, origin/main, origin/feature-activitypub, feature-activitypub) activitypub: implement Repository
95992a2cb activitypub: hack_16834
088498a47 activitypub: implement the ReqSignature middleware
5f7a7eb58 activitypub: signing http client
5f30b8b52 activitypub: go-fed conformant Clock instance
d04c7290d activitypub: add the public key to Person (#14186)
f9378ca6e activitypub: implement /api/v1/activitypub/user/{username} (#14186)
e07befbf7 (origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
813e2930e repo: add a .projectbase repository to each project
a5841f629 repository: cloneLink(suffix) instead of cloneLink(isWiki)
15bc3c9a3 (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
cace8830f (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
d9708d4d1 CI: unit tests for models race with each other and sometime fail
263cde338 CI: setup GitLab CI
a893b3f0c (origin/feature-go-fed, feature-go-fed) go.mod: add go-fed/{httpsig,activity/pub,activity/streams} dependency
5f0bf3cf0 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+
1 Like

Today’s rebasing took 10 minutes (28 new commits). There was one conflict for go-fed because other packages have been updated.

$ git describe gitea/main
v1.17.0-dev-574-gcafa2dcb8
$ git log --oneline --no-merges gitea/main..origin/main
988443a7c (HEAD -> main, origin/main, origin/feature-activitypub, feature-activitypub) activitypub: implement Repository
f2c8b594b activitypub: hack_16834
ff991b4d7 activitypub: implement the ReqSignature middleware
e92f8610e activitypub: signing http client
b7991f880 activitypub: go-fed conformant Clock instance
7eaf68082 activitypub: add the public key to Person (#14186)
d647b9896 activitypub: implement /api/v1/activitypub/user/{username} (#14186)
90abf75e0 (origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
23e751028 repo: add a .projectbase repository to each project
aa0a8deec repository: cloneLink(suffix) instead of cloneLink(isWiki)
24fa22ce6 (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
1312906ec (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
ad0e0d206 CI: unit tests for models race with each other and sometime fail
f875d5aa4 CI: setup GitLab CI
d7b36bfa4 (origin/feature-go-fed, feature-go-fed) go.mod: add go-fed/{httpsig,activity/pub,activity/streams} dependency
2d97cfcf5 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+
1 Like

Today’s rebasing took 10 minutes (36 new commits). There were errors because the signature of GetUserByName changed.


$ git describe gitea/main
v1.17.0-dev-610-gfa5dec966
$ git log --oneline --no-merges gitea/main..origin/main
32a3d3302 (HEAD -> main, origin/main, origin/feature-activitypub, feature-activitypub) activitypub: implement Repository
4dfa0a7a7 activitypub: hack_16834
0b7a0b325 activitypub: implement the ReqSignature middleware
10e3a0c99 activitypub: signing http client
aa8cd052e activitypub: go-fed conformant Clock instance
85d2b93ae activitypub: add the public key to Person (#14186)
cf1b83532 activitypub: implement /api/v1/activitypub/user/{username} (#14186)
57de1ec9d (origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
d702e9afd repo: add a .projectbase repository to each project
cebbc1cf3 repository: cloneLink(suffix) instead of cloneLink(isWiki)
2d63bfdfe (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
1ca9b2028 (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
cac575bd7 CI: unit tests for models race with each other and sometime fail
ef49ecb37 CI: setup GitLab CI
ba07b6918 (origin/feature-go-fed, feature-go-fed) go.mod: add go-fed/{httpsig,activity/pub,activity/streams} dependency
45ad73110 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+
1 Like

Today’s rebasing took 15 minutes (19 new commits). There were merge conflicts because new go modules were added and the Makefile was slightly modified.


$ git describe gitea/main
v1.17.0-dev-629-ge0273bad7
$ git log --oneline --no-merges gitea/main..origin/main
f94b7bc60 (HEAD -> main, origin/main, origin/feature-activitypub, feature-activitypub) activitypub: implement Repository
72cd1e1a4 activitypub: hack_16834
2de95230e activitypub: implement the ReqSignature middleware
a6ee177e4 activitypub: signing http client
bb5ded72a activitypub: go-fed conformant Clock instance
fee19177e activitypub: add the public key to Person (#14186)
cdfca4910 activitypub: implement /api/v1/activitypub/user/{username} (#14186)
09c3658ce (origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
13aecef5b repo: add a .projectbase repository to each project
c08d86c74 repository: cloneLink(suffix) instead of cloneLink(isWiki)
0aaf4f259 (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
7192638f4 CI: unit tests for models race with each other and sometime fail
3f76569c8 CI: setup GitLab CI
854a4be6d (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
0a59a3809 (origin/feature-go-fed, feature-go-fed) go.mod: add go-fed/{httpsig,activity/pub,activity/streams} dependency
1a7dfdab8 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+

Today’s rebasing took 10 minutes (35 new commits). There were merge conflicts because go-fed/httpsig was added as a dependency (but not the same version as what go-fed needs).


$ git describe gitea/main
v1.17.0-dev-664-g73382d213
$ git log --oneline --no-merges gitea/main..origin/main
f94b7bc60 (origin/main) activitypub: implement Repository
72cd1e1a4 activitypub: hack_16834
2de95230e activitypub: implement the ReqSignature middleware
a6ee177e4 activitypub: signing http client
bb5ded72a activitypub: go-fed conformant Clock instance
fee19177e activitypub: add the public key to Person (#14186)
cdfca4910 activitypub: implement /api/v1/activitypub/user/{username} (#14186)
09c3658ce projectbase: implement tests for UpdateProjectBase
13aecef5b repo: add a .projectbase repository to each project
c08d86c74 repository: cloneLink(suffix) instead of cloneLink(isWiki)
0aaf4f259 tests: do not test against the GitHub API
7192638f4 CI: unit tests for models race with each other and sometime fail
3f76569c8 CI: setup GitLab CI
854a4be6d gitignore: emacs backups
0a59a3809 go.mod: add go-fed/{httpsig,activity/pub,activity/streams} dependency
1a7dfdab8 forgefriends is licensed under AGPLv3+
1 Like

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+

Today’s rebasing took ~4 hours (60 new commits) because:


$ git describe gitea/main
v1.18.0-dev-9-ge91229eef
$ git log --oneline --no-merges gitea/main..origin/main
c4db14c1f (HEAD -> main, origin/main, origin/feature-projectbase, feature-projectbase) projectbase: implement tests for UpdateProjectBase
684179b1e repo: add a .projectbase repository to each project
a8e22a00f repository: cloneLink(suffix) instead of cloneLink(isWiki)
53b533d12 (origin/feature-fff, origin/base-fff, feature-fff, base-fff) gofff: replace Gitea migration
14aca726d tests: integration tests for the Gitea migration form
20433e847 gofff: get module
effe4fde9 gofff: lfs not implemented yet
f7df3052f gofff: remove the Gitea migration implementation
6d485b068 (origin/feature-development-environment, feature-development-environment) gitignore: emacs backups
f7507898f (origin/feature-gitlab-ci, feature-gitlab-ci) tests: do not test against the GitHub API
ce651af2d CI: unit tests for models race with each other and sometime fail
199007c32 CI: setup GitLab CI
a0def53c5 (origin/feature-licensing, feature-licensing) forgefriends is licensed under AGPLv3+