self-hosted/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-01-11 17:18:09 +02:00
Code Issues Releases Activity

Merge branch 'origin/release/v2.8' into 'next-release/release/v2.8'

Browse Source
This commit is contained in:
oauth 2025-01-10 17:51:00 +00:00
commit ef76d4a7c1
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/forge/addon/args.go
View File

@ -110,6 +110,9 @@ type modelUser struct {
}
func (m *modelUser) asModel() *model.User {
if m == nil {
return nil
}
m.User.ForgeRemoteID = m.ForgeRemoteID
m.User.Token = m.Token
m.User.Secret = m.Secret
@ -119,6 +122,9 @@ func (m *modelUser) asModel() *model.User {
}
func modelUserFromModel(u *model.User) *modelUser {
if u == nil {
return nil
}
return &modelUser{
User: u,
ForgeRemoteID: u.ForgeRemoteID,
@ -138,6 +144,9 @@ type modelRepo struct {
}
func (m *modelRepo) asModel() *model.Repo {
if m == nil {
return nil
}
m.Repo.UserID = m.UserID
m.Repo.Hash = m.Hash
m.Repo.Perm = m.Perm
@ -145,6 +154,9 @@ func (m *modelRepo) asModel() *model.Repo {
}
func modelRepoFromModel(r *model.Repo) *modelRepo {
if r == nil {
return nil
}
return &modelRepo{
Repo: r,
UserID: r.UserID,