mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-11-23 10:21:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1833 from donny-dont/fix/secret_ordering

Browse source 
Fix ordering of secrets within merge
This commit is contained in:
Brad Rydzewski 2016-10-25 00:36:19 +02:00 committed by GitHub
commit 655cbf0f30
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
store/store.go
View file

@ -271,13 +271,13 @@ func GetMergedSecretList(c context.Context, r *model.Repo) ([]*model.Secret, err
secrets []*model.Secret secrets []*model.Secret
) )
repoSecs, err := GetSecretList(c, r) globalSecs, err := GetGlobalSecretList(c)
if err != nil { if err != nil {
return nil, err return nil, err
} }
for _, secret := range repoSecs { for _, secret := range globalSecs {
secrets = append(secrets, secret.Secret()) secrets = append(secrets, secret.Secret())
} }
@ -291,13 +291,13 @@ func GetMergedSecretList(c context.Context, r *model.Repo) ([]*model.Secret, err
secrets = append(secrets, secret.Secret()) secrets = append(secrets, secret.Secret())
} }
globalSecs, err := GetGlobalSecretList(c) repoSecs, err := GetSecretList(c, r)
if err != nil { if err != nil {
return nil, err return nil, err
} }
for _, secret := range globalSecs { for _, secret := range repoSecs {
secrets = append(secrets, secret.Secret()) secrets = append(secrets, secret.Secret())
} }