Merge remote-tracking branch 'upstream/main' into refresh-concurrency

cmd/server/openapi/docs.go

@@ -4705,6 +4705,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "creator_id": {
+                    "description": "TODO: drop with next major version",
                     "type": "integer"
                 },
                 "enabled": {

server/cron/cron_test.go

@@ -34,7 +34,7 @@ func TestCreatePipeline(t *testing.T) {
 	store := store_mocks.NewMockStore(t)
 	ctx := t.Context()
 
-	creator := &model.User{
+	repoUser := &model.User{
 		ID:    1,
 		Login: "user1",
 	}
@@ -44,12 +44,13 @@ func TestCreatePipeline(t *testing.T) {
 		Owner:    "owner1",
 		FullName: "repo1/owner1",
 		Branch:   "default",
+		UserID:   repoUser.ID,
 	}
 
 	// mock things
 	store.On("GetRepo", mock.Anything).Return(repo1, nil)
-	store.On("GetUser", mock.Anything).Return(creator, nil)
-	_forge.On("BranchHead", mock.Anything, creator, repo1, "default").Return(&model.Commit{
+	store.On("GetUser", mock.Anything).Return(repoUser, nil)
+	_forge.On("BranchHead", mock.Anything, repoUser, repo1, "default").Return(&model.Commit{
 		ForgeURL: "https://example.com/sha1",
 		SHA:      "sha1",
 	}, nil)

server/model/cron.go

@@ -24,7 +24,7 @@ type Cron struct {
 	ID        int64             `json:"id"         xorm:"pk autoincr 'id'"`
 	Name      string            `json:"name"       xorm:"name UNIQUE(s) INDEX"`
 	RepoID    int64             `json:"repo_id"    xorm:"repo_id UNIQUE(s) INDEX"`
-	CreatorID int64             `json:"creator_id" xorm:"creator_id INDEX"`
+	CreatorID int64             `json:"creator_id" xorm:"creator_id INDEX"` // TODO: drop with next major version
 	NextExec  int64             `json:"next_exec"  xorm:"next_exec"`
 	Schedule  string            `json:"schedule"   xorm:"schedule NOT NULL"` //	@weekly,	3min, ...
 	Created   int64             `json:"created"    xorm:"created NOT NULL DEFAULT 0"`