mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-04-26 21:44:44 +00:00
Code Issues Projects Releases Wiki Activity

Fix mistakes caused from splitting out into PRs

Browse source
This commit is contained in:
Ian 2020-05-19 13:20:29 +01:00
parent 0d90789422
commit 1f8b3c4a45
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
router/middleware/config.go
View file

@ -39,7 +39,7 @@ func setupConfig(c *cli.Context) *model.Settings {
Secret: c.String("agent-secret"), Secret: c.String("agent-secret"),
Admins: sliceToMap2(c.StringSlice("admin")), Admins: sliceToMap2(c.StringSlice("admin")),
Orgs: sliceToMap2(c.StringSlice("orgs")), Orgs: sliceToMap2(c.StringSlice("orgs")),
OwnersWhitelist: sliceToMap2(c.StringSlice("repo-owner")), OwnersWhitelist: sliceToMap2(c.StringSlice("repo-owners")),
} }
} }

4
server/user.go
View file

@ -51,7 +51,7 @@ func GetFeed(c *gin.Context) {
remote: remote.FromContext(c), remote: remote.FromContext(c),
store: store.FromContext(c), store: store.FromContext(c),
perms: store.FromContext(c), perms: store.FromContext(c),
match: NamespaceFilter(config.Orgs), match: NamespaceFilter(config.OwnersWhitelist),
} }
if err := sync.Sync(user); err != nil { if err := sync.Sync(user); err != nil {
logrus.Debugf("sync error: %s: %s", user.Login, err) logrus.Debugf("sync error: %s: %s", user.Login, err)
@ -96,7 +96,7 @@ func GetRepos(c *gin.Context) {
remote: remote.FromContext(c), remote: remote.FromContext(c),
store: store.FromContext(c), store: store.FromContext(c),
perms: store.FromContext(c), perms: store.FromContext(c),
match: NamespaceFilter(config.Orgs), match: NamespaceFilter(config.OwnersWhitelist),
} }