mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-02-16 11:25:14 +00:00
Code Issues Projects Releases Wiki Activity

fix merge

Browse source
This commit is contained in:
qwerty287 2024-11-19 17:07:35 +02:00
parent cfeeadbbc2
commit 32dd679a85
No known key found for this signature in database
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
server/store/datastore/migration/019_remove_repo_netrc_only_trusted.go → server/store/datastore/migration/020_remove_repo_netrc_only_trusted.go
View file

5
server/store/datastore/migration/migration.go
View file

@ -47,11 +47,8 @@ var migrationTasks = []*xormigrate.Migration{
&addCustomLabelsToAgent,
&splitTrusted,
&correctPotentialCorruptOrgsUsersRelation,
<<<<<<< HEAD
&removeRepoNetrcOnlyTrusted,
=======
&gatedToRequireApproval,
>>>>>>> main
&removeRepoNetrcOnlyTrusted,
}
var allBeans = []any{