forked from go-gitea/gitea
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'giteaoffical/main'
* giteaoffical/main: Fix db.Find bug (go-gitea#23115) Avoid warning for system setting when start up (go-gitea#23054) Require approval to run actions for fork pull request (go-gitea#22803) Fix nil context in RenderMarkdownToHtml (go-gitea#23092) Add HesterG to maintainers (go-gitea#23104) improve FindProjects (go-gitea#23085)
- Loading branch information
Showing
37 changed files
with
276 additions
and
86 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
// Copyright 2023 The Gitea Authors. All rights reserved. | ||
// SPDX-License-Identifier: MIT | ||
|
||
package db_test | ||
|
||
import ( | ||
"testing" | ||
|
||
"code.gitea.io/gitea/models/db" | ||
repo_model "code.gitea.io/gitea/models/repo" | ||
"code.gitea.io/gitea/models/unittest" | ||
|
||
"github.com/stretchr/testify/assert" | ||
"xorm.io/builder" | ||
) | ||
|
||
type mockListOptions struct { | ||
db.ListOptions | ||
} | ||
|
||
func (opts *mockListOptions) IsListAll() bool { | ||
return true | ||
} | ||
|
||
func (opts *mockListOptions) ToConds() builder.Cond { | ||
return builder.NewCond() | ||
} | ||
|
||
func TestFind(t *testing.T) { | ||
assert.NoError(t, unittest.PrepareTestDatabase()) | ||
xe := unittest.GetXORMEngine() | ||
assert.NoError(t, xe.Sync(&repo_model.RepoUnit{})) | ||
|
||
opts := mockListOptions{} | ||
var repoUnits []repo_model.RepoUnit | ||
err := db.Find(db.DefaultContext, &opts, &repoUnits) | ||
assert.NoError(t, err) | ||
assert.EqualValues(t, 83, len(repoUnits)) | ||
|
||
cnt, err := db.Count(db.DefaultContext, &opts, new(repo_model.RepoUnit)) | ||
assert.NoError(t, err) | ||
assert.EqualValues(t, 83, cnt) | ||
|
||
repoUnits = make([]repo_model.RepoUnit, 0, 10) | ||
newCnt, err := db.FindAndCount(db.DefaultContext, &opts, &repoUnits) | ||
assert.NoError(t, err) | ||
assert.EqualValues(t, cnt, newCnt) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
// Copyright 2023 The Gitea Authors. All rights reserved. | ||
// SPDX-License-Identifier: MIT | ||
|
||
package v1_20 //nolint | ||
|
||
import ( | ||
"xorm.io/xorm" | ||
) | ||
|
||
func AddNeedApprovalToActionRun(x *xorm.Engine) error { | ||
/* | ||
New index: TriggerUserID | ||
New fields: NeedApproval, ApprovedBy | ||
*/ | ||
type ActionRun struct { | ||
TriggerUserID int64 `xorm:"index"` | ||
NeedApproval bool // may need approval if it's a fork pull request | ||
ApprovedBy int64 `xorm:"index"` // who approved | ||
} | ||
|
||
return x.Sync(new(ActionRun)) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.