mirror of
https://github.com/go-gitea/gitea.git
synced 2025-11-16 14:25:28 +01:00
Fix bug
This commit is contained in:
parent
097c649387
commit
7b4c3e2a87
@ -4,31 +4,14 @@
|
|||||||
package v1_24 //nolint
|
package v1_24 //nolint
|
||||||
|
|
||||||
import (
|
import (
|
||||||
<<<<<<< HEAD
|
|
||||||
"code.gitea.io/gitea/modules/timeutil"
|
|
||||||
=======
|
|
||||||
"code.gitea.io/gitea/models/perm"
|
"code.gitea.io/gitea/models/perm"
|
||||||
>>>>>>> main
|
|
||||||
|
|
||||||
"xorm.io/xorm"
|
"xorm.io/xorm"
|
||||||
)
|
)
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
func CreateTableIssueDevLink(x *xorm.Engine) error {
|
|
||||||
type IssueDevLink struct {
|
|
||||||
ID int64 `xorm:"pk autoincr"`
|
|
||||||
IssueID int64 `xorm:"INDEX"`
|
|
||||||
LinkType int
|
|
||||||
LinkedRepoID int64 `xorm:"INDEX"` // it can link to self repo or other repo
|
|
||||||
LinkIndex string // branch name, pull request number or commit sha
|
|
||||||
CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"`
|
|
||||||
}
|
|
||||||
return x.Sync(new(IssueDevLink))
|
|
||||||
=======
|
|
||||||
func AddRepoUnitAnonymousAccessMode(x *xorm.Engine) error {
|
func AddRepoUnitAnonymousAccessMode(x *xorm.Engine) error {
|
||||||
type RepoUnit struct { //revive:disable-line:exported
|
type RepoUnit struct { //revive:disable-line:exported
|
||||||
AnonymousAccessMode perm.AccessMode `xorm:"NOT NULL DEFAULT 0"`
|
AnonymousAccessMode perm.AccessMode `xorm:"NOT NULL DEFAULT 0"`
|
||||||
}
|
}
|
||||||
return x.Sync(&RepoUnit{})
|
return x.Sync(&RepoUnit{})
|
||||||
>>>>>>> main
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user